]> Pileus Git - ~andy/sunrise/blobdiff - games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch
games-strategy/0ad: New Ebuild for bug 278541 thanks to mgorny and binki
[~andy/sunrise] / games-strategy / 0ad / files / 11339_alpha9-fcollada-makefile.patch
diff --git a/games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch b/games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch
new file mode 100644 (file)
index 0000000..e397e86
--- /dev/null
@@ -0,0 +1,26 @@
+From: hasufell <julian.ospald@googlemail.com>
+Date: Wed Apr 11 14:45:32 UTC 2012
+
+FCollada Makefile does not respect CXX and flags
+
+--- libraries/fcollada/src/Makefile
++++ libraries/fcollada/src/Makefile
+@@ -7,14 +7,14 @@
+ PIC_FLAGS ?= -fpic
+ endif
+-CXX := g++
+-CXXFLAGS := -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
++CXX ?= g++
++CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
+ CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
+ CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
+ # (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1)
+ CXXFLAGS_TEST := -O0 -g -D_DEBUG
+-LIBS := `pkg-config libxml-2.0 --libs`
+-INCLUDES := -IFCollada `pkg-config libxml-2.0 --cflags`
++LIBS += `pkg-config libxml-2.0 --libs`
++INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
+ INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)
+ # FCollada is not aliasing-safe, so disallow dangerous optimisations