Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-strategy/0ad/files: 0ad-0.0.16_alpha-gentoo.patch
Date: Wed, 21 May 2014 18:09:17
Message-Id: 20140521180913.F04A82004E@flycatcher.gentoo.org
1 hasufell 14/05/21 18:09:13
2
3 Added: 0ad-0.0.16_alpha-gentoo.patch
4 Log:
5 initial import wrt #278541
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
8
9 Revision Changes Path
10 1.1 games-strategy/0ad/files/0ad-0.0.16_alpha-gentoo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/0ad/files/0ad-0.0.16_alpha-gentoo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/0ad/files/0ad-0.0.16_alpha-gentoo.patch?rev=1.1&content-type=text/plain
14
15 Index: 0ad-0.0.16_alpha-gentoo.patch
16 ===================================================================
17 From: Julian Ospald <hasufell@g.o>
18 Date: Sun Jun 24 18:32:38 UTC 2012
19 Subject: build system
20
21 respect flags
22 let stripping be handled by the system
23
24 fix minimal-flags option:
25 leave -fvisibility=hidden active
26 leave conditional -fpc-preprocess active
27
28 --- build/premake/premake4.lua
29 +++ build/premake/premake4.lua
30 @@ -145,7 +145,7 @@
31
32 function project_set_build_flags()
33
34 - flags { "Symbols", "NoEditAndContinue" }
35 + flags { "NoEditAndContinue" }
36 if not _OPTIONS["icc"] and (os.is("windows") or not _OPTIONS["minimal-flags"]) then
37 -- adds the -Wall compiler flag
38 flags { "ExtraWarnings" } -- this causes far too many warnings/remarks on ICC
39 @@ -337,13 +337,11 @@
40 end
41 end
42
43 - if not _OPTIONS["minimal-flags"] then
44 buildoptions {
45 -- Hide symbols in dynamic shared objects by default, for efficiency and for equivalence with
46 -- Windows - they should be exported explicitly with __attribute__ ((visibility ("default")))
47 "-fvisibility=hidden"
48 }
49 - end
50
51 if _OPTIONS["bindir"] then
52 defines { "INSTALLED_BINDIR=" .. _OPTIONS["bindir"] }
53 --- libraries/source/fcollada/src/Makefile
54 +++ libraries/source/fcollada/src/Makefile
55 @@ -9,8 +9,8 @@
56
57 CXX ?= g++
58 CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
59 -CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
60 -CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
61 +CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
62 +CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
63 # (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1 until gcc >4.3 is typical.)
64 CXXFLAGS_TEST := -O0 -g -D_DEBUG
65 LIBS += `pkg-config libxml-2.0 --libs`
66 --- build/premake/premake4/src/tools/gcc.lua
67 +++ build/premake/premake4/src/tools/gcc.lua
68 @@ -136,8 +136,6 @@
69 if not cfg.flags.Symbols then
70 if cfg.system == "macosx" then
71 table.insert(result, "-Wl,-x")
72 - else
73 - table.insert(result, "-s")
74 end
75 end
76
77 --- build/premake/premake4/build/gmake.unix/Premake4.make
78 +++ build/premake/premake4/build/gmake.unix/Premake4.make
79 @@ -26,9 +26,9 @@
80 DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
81 INCLUDES += -I../../src/host/lua-5.1.4/src
82 CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
83 - CFLAGS += $(CPPFLAGS) -Wall -Os
84 - CXXFLAGS += $(CPPFLAGS) -Wall -Os
85 - LDFLAGS += -s -rdynamic
86 + CFLAGS += $(CPPFLAGS) -Wall
87 + CXXFLAGS += $(CPPFLAGS) -Wall
88 + LDFLAGS += -rdynamic
89 LIBS += -lm -ldl
90 RESFLAGS += $(DEFINES) $(INCLUDES)
91 LDDEPS +=
92 @@ -48,8 +48,8 @@
93 DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
94 INCLUDES += -I../../src/host/lua-5.1.4/src
95 CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
96 - CFLAGS += $(CPPFLAGS) -Wall -g
97 - CXXFLAGS += $(CPPFLAGS) -Wall -g
98 + CFLAGS += $(CPPFLAGS) -Wall
99 + CXXFLAGS += $(CPPFLAGS) -Wall
100 LDFLAGS += -rdynamic
101 LIBS += -lm -ldl
102 RESFLAGS += $(DEFINES) $(INCLUDES)
103 @@ -302,4 +302,4 @@
104 $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<"
105
106 -include $(OBJECTS:%.o=%.d)
107 --include $(GCH:%.h.gch=%.h.d)
108 \ No newline at end of file
109 +-include $(GCH:%.h.gch=%.h.d)