1 |
hasufell 13/11/22 19:44:24 |
2 |
|
3 |
Added: eduke32-20131119.4169-QA.patch |
4 |
Removed: eduke32-20130207.3467-QA.patch |
5 |
Log: |
6 |
version bump, remove old |
7 |
|
8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 games-fps/eduke32/files/eduke32-20131119.4169-QA.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/eduke32/files/eduke32-20131119.4169-QA.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/eduke32/files/eduke32-20131119.4169-QA.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: eduke32-20131119.4169-QA.patch |
17 |
=================================================================== |
18 |
From: Julian Ospald <hasufell@g.o> |
19 |
Date: Sat Feb 2 01:16:21 UTC 2013 |
20 |
Subject: build system |
21 |
|
22 |
respect CC/CXX etc and CFLAGS/CXXFLAGS/LDFLAGS |
23 |
|
24 |
--- eduke32_20130201-3453/Makefile |
25 |
+++ eduke32_20130201-3453/Makefile |
26 |
@@ -311,10 +311,10 @@ |
27 |
endif |
28 |
|
29 |
COMPILER=$(CC) $(OURCONLYFLAGS) |
30 |
-LINKER=$(L_CC) |
31 |
+LINKER=$(L_CC) $(OURCFLAGS) $(OURCONLYFLAGS) |
32 |
ifneq ($(CPLUSPLUS),0) |
33 |
COMPILER=$(CXX) $(OURCXXFLAGS) |
34 |
- LINKER=$(L_CXX) |
35 |
+ LINKER=$(L_CXX) $(OURCXXFLAGS) |
36 |
endif |
37 |
|
38 |
ifeq ($(PRETTY_OUTPUT),1) |
39 |
--- eduke32_20130201-3453/Makefile.common |
40 |
+++ eduke32_20130201-3453/Makefile.common |
41 |
@@ -10,13 +10,14 @@ |
42 |
|
43 |
# Tools |
44 |
CROSS= |
45 |
-CC=$(CROSS)gcc |
46 |
-CXX=$(CROSS)g++ |
47 |
-AS=$(CROSS)nasm |
48 |
-AR=$(CROSS)ar |
49 |
-RC=$(CROSS)windres |
50 |
-RANLIB=$(CROSS)ranlib |
51 |
-STRIP=$(CROSS)strip |
52 |
+CC ?= $(CROSS)gcc |
53 |
+CXX ?= $(CROSS)g++ |
54 |
+AS ?= $(CROSS)nasm |
55 |
+AR ?= $(CROSS)ar |
56 |
+RC ?= $(CROSS)windres |
57 |
+RANLIB ?= $(CROSS)ranlib |
58 |
+STRIP ?= $(CROSS)strip |
59 |
+PKG_CONFIG ?= pkgconfig |
60 |
|
61 |
L_CC=$(CC) |
62 |
L_CXX=$(CXX) |
63 |
@@ -164,7 +165,6 @@ |
64 |
# FORCEWARNINGS - 1 = do not disable any compiler warnings within the source |
65 |
# KRANDDEBUG - 1 = include logging of krand() calls for debugging the demo system |
66 |
# EFENCE - 1 = compile with Electric Fence for malloc() debugging |
67 |
-# OPTLEVEL - 0..3 = GCC optimization strategy |
68 |
# LTO - 1 = enable link-time optimization, for GCC 4.5 and up |
69 |
# |
70 |
CPLUSPLUS?=0 |
71 |
@@ -178,13 +178,6 @@ |
72 |
PROFILER?=0 |
73 |
MUDFLAP?=0 |
74 |
|
75 |
-# Select the default optimization level for release and debug builds. |
76 |
-ifeq ($(RELEASE),0) |
77 |
- OPTLEVEL?=0 |
78 |
-else |
79 |
- OPTLEVEL?=2 |
80 |
-endif |
81 |
- |
82 |
ifeq ($(RELEASE),0) |
83 |
override STRIP= |
84 |
endif |
85 |
@@ -293,10 +286,9 @@ |
86 |
|
87 |
# compiler flags etc. |
88 |
BASECFLAGS= |
89 |
-BASECONLYFLAGS=-Wimplicit -Wdeclaration-after-statement |
90 |
-BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings |
91 |
-BASEASFLAGS=-s #-g |
92 |
-BASELDFLAGS= |
93 |
+BASECONLYFLAGS = $(CFLAGS) -std=gnu89 -Wimplicit -Wdeclaration-after-statement |
94 |
+BASECXXFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing |
95 |
+BASELDFLAGS = $(LDFLAGS) |
96 |
|
97 |
|
98 |
ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4))) |
99 |
@@ -330,19 +322,6 @@ |
100 |
endif |
101 |
|
102 |
|
103 |
-ifneq ($(RELEASE)$(DEBUGANYWAY),10) |
104 |
- # debug build or DEBUGANYWAY=1 --> -g flag |
105 |
- ifneq (0,$(CLANG)) |
106 |
- debug=-g |
107 |
- else ifeq ($(PLATFORM), WII) |
108 |
- debug=-g |
109 |
- else |
110 |
- debug=-ggdb |
111 |
- endif |
112 |
-endif |
113 |
- |
114 |
-debug+= -O$(OPTLEVEL) |
115 |
- |
116 |
# See http://clang.llvm.org/docs/UsersManual.html#controlling-code-generation |
117 |
# for a list of possible UBSan options. |
118 |
# Clang 3.2 does only supports -fsanitize=address for the AddressSanitizer |
119 |
@@ -458,7 +437,7 @@ |
120 |
|
121 |
#### Lunatic development |
122 |
# LuaJIT standalone interpreter executable: |
123 |
-LUAJIT:=luajit |
124 |
+LUAJIT:=$(shell command -v luajit || command -v luajit-2 || command -v luajit-2.0) |
125 |
# Options to "luajit -b" for synthesis. Since it runs on Linux, we need to tell |
126 |
# the native LuaJIT to emit PE object files. |
127 |
ifneq ($(SYNTHESIS),0) |
128 |
@@ -487,7 +466,8 @@ |
129 |
ifeq ($(PLATFORM),WINDOWS) |
130 |
BASELIBS+= -lluajit |
131 |
else |
132 |
- BASELIBS+= -lluajit-5.1 |
133 |
+ BASECOMMONFLAGS+= $(shell $(PKG_CONFIG) --cflags luajit 2>/dev/null || $(PKG_CONFIG) --cflags luajit-2.0) |
134 |
+ BASELIBS+= $(shell $(PKG_CONFIG) --libs luajit 2>/dev/null || $(PKG_CONFIG) --libs luajit-2.0) |
135 |
endif |
136 |
endif |
137 |
|
138 |
--- eduke32_20130201-3453/build/Makefile |
139 |
+++ eduke32_20130201-3453/build/Makefile |
140 |
@@ -167,13 +167,15 @@ |
141 |
OURCOMMONFLAGS+= $(BUILDCOMMONFLAGS) |
142 |
|
143 |
COMPILER=$(CC) $(OURCONLYFLAGS) |
144 |
-LINKER=$(L_CC) |
145 |
+LINKER=$(L_CC) $(OURCFLAGS) $(OURCONLYFLAGS) |
146 |
ifneq ($(CPLUSPLUS),0) |
147 |
COMPILER=$(CXX) $(OURCXXFLAGS) |
148 |
- LINKER=$(L_CXX) |
149 |
+ LINKER=$(L_CXX) $(OURCXXFLAGS) |
150 |
endif |
151 |
|
152 |
-.SILENT: |
153 |
+ifeq ($(PRETTY_OUTPUT),1) |
154 |
+ .SILENT: |
155 |
+endif |
156 |
.PHONY: clean cleanutils veryclean all utils dxutils sdlutils printutils printsdlutils printdxutils enginelib editorlib |
157 |
|
158 |
# TARGETS |
159 |
@@ -266,7 +268,7 @@ |
160 |
if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(UTILLIBS) -I$(SDLROOT)/include -I$(SDLROOT)/include/SDL; then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi |
161 |
arttool$(EXESUFFIX): $(OBJ)/arttool.$o $(UTILADDOBJS) |
162 |
$(ONESTEP_STATUS) |
163 |
- if $(L_CXX) -o $@ $^ $(OURLDFLAGS) $(STATICSTDCPP) $(STDCPPLIB) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi |
164 |
+ if $(L_CXX) $(OURCXXFLAGS) -o $@ $^ $(OURLDFLAGS) $(STATICSTDCPP) $(STDCPPLIB) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi |
165 |
givedepth$(EXESUFFIX): $(OBJ)/givedepth.$o $(UTILADDOBJS) |
166 |
$(ONESTEP_STATUS) |
167 |
if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi |