2f94441ffc
- Avoid use of descending relative paths in %files - Add patch to allow using %optflags and resolve the prior rpmlint message about the lack of it OBS-URL: https://build.opensuse.org/request/show/112489 OBS-URL: https://build.opensuse.org/package/show/games/angelscript?expand=0&rev=2
58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
From: Jan Engelhardt <jengelh@medozas.de>
|
|
Date: 2012-04-04 18:58:52.144352570 +0200
|
|
|
|
Do not touch CXXFLAGS so that it can be overridden by the user.
|
|
|
|
---
|
|
angelscript/projects/gnuc/makefile | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
Index: sdk/angelscript/projects/gnuc/makefile
|
|
===================================================================
|
|
--- sdk.orig/angelscript/projects/gnuc/makefile
|
|
+++ sdk/angelscript/projects/gnuc/makefile
|
|
@@ -26,7 +26,7 @@ ifeq ($(TARGETPLATFORM), iphone)
|
|
OBJDIR = obj-iphone
|
|
LIBDIR = ../../lib-iphone
|
|
CXX = $(IPHONEBIN)/arm-apple-darwin9-g++-4.0.1
|
|
- CXXFLAGS += -g -Wall -fPIC -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.2.sdk
|
|
+ my_CXXFLAGS += -g -Wall -fPIC -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.2.sdk
|
|
else ifeq ($(TARGETPLATFORM), android)
|
|
ANDROIDNDKROOT = /cygdrive/c/android/android-ndk-1.6_r1
|
|
ANDROIDBIN = $(ANDROIDNDKROOT)/build/prebuilt/windows/arm-eabi-4.2.1/bin
|
|
@@ -34,7 +34,7 @@ else ifeq ($(TARGETPLATFORM), android)
|
|
OBJDIR = obj-android
|
|
LIBDIR = ../../lib-android
|
|
CXX = $(ANDROIDBIN)/arm-eabi-gcc
|
|
- CXXFLAGS += -g -Wall -I$(SYSROOT)/usr/include \
|
|
+ my_CXXFLAGS += -g -Wall -I$(SYSROOT)/usr/include \
|
|
-Wall \
|
|
-DANDROID \
|
|
-fno-exceptions \
|
|
@@ -46,7 +46,7 @@ else
|
|
CXX ?= gcc
|
|
# On i686 architecture you may need to add -march=i686 if you get
|
|
# an undefined symbol for __sync_sub_and_fetch_4 in as_atomic.cpp.
|
|
- CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
|
|
+ my_CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
|
|
endif
|
|
|
|
AR ?= ar
|
|
@@ -120,13 +120,13 @@ $(LIBDIR):
|
|
mkdir $(LIBDIR)
|
|
|
|
$(OBJDIR)/%.o: $(SRCDIR)/%.cpp
|
|
- $(CXX) $(CXXFLAGS) -o $@ -c $<
|
|
+ $(CXX) $(my_CXXFLAGS) $(CXXFLAGS) -o $@ -c $<
|
|
|
|
$(OBJDIR)/%.o: $(SRCDIR)/%.S
|
|
- $(CXX) $(CXXFLAGS) -o $@ -c $<
|
|
+ $(CXX) $(my_CXXFLAGS) $(CXXFLAGS) -o $@ -c $<
|
|
|
|
$(OBJDIR)/%.o: $(SRCDIR)/%.s
|
|
- $(CXX) $(CXXFLAGS) -o $@ -c $<
|
|
+ $(CXX) $(my_CXXFLAGS) $(CXXFLAGS) -o $@ -c $<
|
|
|
|
|
|
clean:
|