Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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-fps/warsow/files: 01-warsow-1.03-clang.patch 02-warsow-1.03-clang.patch warsow-1.03-build.patch warsow-1.03-pic.patch 03-warsow-1.03-clang.patch
Date: Sat, 09 Nov 2013 12:44:37
Message-Id: 20131109124430.913E52004E@flycatcher.gentoo.org
1 hasufell 13/11/09 12:44:30
2
3 Added: 01-warsow-1.03-clang.patch
4 02-warsow-1.03-clang.patch warsow-1.03-build.patch
5 warsow-1.03-pic.patch 03-warsow-1.03-clang.patch
6 Log:
7 version bump and fix build with clang wrt #448714
8
9 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
10
11 Revision Changes Path
12 1.1 games-fps/warsow/files/01-warsow-1.03-clang.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/01-warsow-1.03-clang.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/01-warsow-1.03-clang.patch?rev=1.1&content-type=text/plain
16
17 Index: 01-warsow-1.03-clang.patch
18 ===================================================================
19 From: Julian Ospald <hasufell@g.o>
20 Date: Sat Nov 9 11:55:42 UTC 2013
21 Subject: fix clang build
22
23 based on
24 https://github.com/viciious/qfusion/commit/b926e692a00dcdeb25a1075c196d6bbefed34172
25
26 --- a/source/unix/unix_glw.c
27 +++ b/source/unix/unix_glw.c
28 @@ -31,17 +31,7 @@ Foundation, Inc., 59 Temple Place - Suit
29 **
30 */
31
32 -#include <termios.h>
33 -#include <sys/ioctl.h>
34 -#include <sys/stat.h>
35 -#include <stdarg.h>
36 -#include <stdio.h>
37 -#include <unistd.h>
38 -#include <signal.h>
39 -#include <dlfcn.h>
40 -
41 #include "../ref_gl/r_local.h"
42 -#include "../client/keys.h"
43
44 #include "x11.h"
45
46
47
48
49 1.1 games-fps/warsow/files/02-warsow-1.03-clang.patch
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/02-warsow-1.03-clang.patch?rev=1.1&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/02-warsow-1.03-clang.patch?rev=1.1&content-type=text/plain
53
54 Index: 02-warsow-1.03-clang.patch
55 ===================================================================
56 From c63672c41ae5332a5d123e3d59abf38417fab961 Mon Sep 17 00:00:00 2001
57 From: Victor Luchits <vluchits@×××××.com>
58 Date: Sat, 12 Oct 2013 15:04:53 +0400
59 Subject: [PATCH] This should fix compilation in clang
60
61 ctassert<false> was evaluated in template function (probably due to two-phase name lookup?). Change it to ctassert<sizeof(typename)==0) so evaluation is delayed until actual template function instantiation.
62 ---
63 source/ui/as/asbind.h | 12 ++++++------
64 1 file changed, 6 insertions(+), 6 deletions(-)
65
66 diff --git a/source/ui/as/asbind.h b/source/ui/as/asbind.h
67 index 9906859..f78ef42 100644
68 --- a/source/ui/as/asbind.h
69 +++ b/source/ui/as/asbind.h
70 @@ -268,7 +268,7 @@ struct ctassert {
71 }
72
73 // throw ?
74 - template<typename T> const char * typestr() { ctassert<false>(); return "ERROR"; }
75 + template<typename T> const char * typestr() { ctassert<sizeof(T)==0>(); return "ERROR"; }
76
77 template<> inline const char *typestr<signed int>() { return "int"; }
78 template<> inline const char *typestr<unsigned int>() { return "uint"; }
79 @@ -439,7 +439,7 @@ struct __ptr<T*> {
80 struct FunctionStringProxy {
81 std::string operator()( const char *s )
82 {
83 - ctassert<false>();
84 + ctassert<sizeof(R)==0>();
85 throw Exception( std::string("FunctionStringProxy base called with " ) + s );
86 }
87 };
88 @@ -542,7 +542,7 @@ struct FunctionStringProxy<R (*)(A1,A2,A3,A4,A5,A6)> {
89 template<typename T> struct MethodStringProxy {
90 std::string operator()( const char *s )
91 {
92 - ctassert<false>();
93 + ctassert<sizeof(T)==0>();
94 throw Exception( std::string( "MethodStringProxy: base class called in " ) + s );
95 }
96 };
97 @@ -904,12 +904,12 @@ struct StripThisProxy<R(*)(A1,A2,A3,A4,A5,A6,A7)> {
98 // first define structs to get/set arguments (struct to partial-specialize)
99 template<typename T> struct SetArg {
100 void operator()( asIScriptContext *ctx, int idx, T &t ) {
101 - ctassert<false>();
102 + ctassert<sizeof(T)==0>();
103 }
104 };
105 template<typename T> struct GetArg {
106 T operator()() {
107 - ctassert<false>();
108 + ctassert<sizeof(T)==0>();
109 return T();
110 }
111 };
112 @@ -1046,7 +1046,7 @@ struct FunctionPtr : FunctionPtrBase {
113 FunctionPtr( asIScriptFunction *fptr=NULL ) : FunctionPtrBase( fptr ) {}
114 R operator()( void )
115 {
116 - ctassert<false>();
117 + ctassert<sizeof(R)==0>();
118 throw std::runtime_error( "FunctionPtr baseclass called!" );
119 return R();
120 }
121 --
122 1.8.4
123
124
125
126 1.1 games-fps/warsow/files/warsow-1.03-build.patch
127
128 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/warsow-1.03-build.patch?rev=1.1&view=markup
129 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/warsow-1.03-build.patch?rev=1.1&content-type=text/plain
130
131 Index: warsow-1.03-build.patch
132 ===================================================================
133 From: Julian Ospald <hasufell@g.o>
134 Date: Thu Oct 11 15:00:18 UTC 2012
135 Subject: build system
136
137 a) respect flags/linker
138 b) don't take ARCH from env (we set BASE_ARCH in the ebuild)
139 c) split LDFLAGS and LDFLAGS_COMMON as per bug
140 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650
141 d) don't remove angel-lib (compilation fails, why is this?)
142 e) make output verbose
143 f) remove start-scripts
144 g) address parallel make issues
145
146 --- source/Makefile
147 +++ source/Makefile
148 @@ -30,6 +30,16 @@
149 # Build Warsow client without server capabilities?
150 BUILD_THIN_CLIENT?=NO
151
152 +# use system libRocket
153 +SYSTEM_LIBS=NO
154 +
155 +# enable verbosity
156 +V=NO
157 +
158 +ifneq ($(V),YES)
159 +Q=@
160 +endif
161 +
162 ###########################################################
163
164 ifeq ($(USE_MINGW),YES)
165 @@ -50,10 +60,10 @@
166 else
167 CC?=gcc
168 CXX?=g++
169 -LD=gcc
170 -LXX?=g++
171 -AR=ar
172 -RANLIB=ranlib
173 +LD=$(CC)
174 +LXX=$(CXX)
175 +AR?=ar
176 +RANLIB?=ranlib
177
178 # this nice line comes from the linux kernel makefile
179 BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
180 @@ -62,7 +72,7 @@
181 ifeq ($(OS),FreeBSD)
182 ARCH?=freebsd_$(BASE_ARCH)
183 else
184 -ARCH?=$(BASE_ARCH)
185 +ARCH=$(BASE_ARCH)
186 endif
187
188 SHARED_LIBRARY_EXTENSION=so
189 @@ -72,7 +82,7 @@
190
191 ifeq ($(DEBUG_BUILD), YES)
192 BINDIR=debug
193 -CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
194 +CFLAGS_DEBUG=-D_DEBUG
195 else
196 BINDIR=release
197 endif
198 @@ -118,15 +128,22 @@
199 LIBROCKET_INC=$(LIBROCKET_DIR)/Include
200 LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a
201
202 -CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC)
203 +CFLAGS_ROCKET=-I$(ANGELSCRIPT_INC)
204 # add the base of ui to inclusions
205 CFLAGS_ROCKET+=-Iui
206
207 # static link to custombuilt lib
208 -LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
209 +LDFLAGS_ROCKET=
210 # dynamic link to 'official' build
211 # LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/Build -lRocketCore -lRocketControls -lfreetype
212
213 +ifneq ($(SYSTEM_LIBS),YES)
214 +CFLAGS_ROCKET += -DSTATIC_LIB -I$(LIBROCKET_INC)
215 +LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
216 +else
217 +LDFLAGS_ROCKET = -lRocketCore -lRocketControls
218 +endif
219 +
220 ###########################################################
221
222 ####################### MINGW ######################
223 @@ -195,9 +212,9 @@
224 LOCALBASE?=/usr/local
225 X11BASE?=/usr/X11R6
226
227 -CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden
228 -CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG -msse2
229 -CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
230 +CFLAGS_COMMON=-I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden
231 +CFLAGS_RELEASE=-fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
232 +CFLAGS_DEBUG=-D_DEBUG
233 ifeq ($(DEBUG_BUILD),YES)
234 CFLAGS_COMMON+=$(CFLAGS_DEBUG)
235 else
236 @@ -209,18 +226,18 @@
237 CFLAGS_MODULE=-DPIC -fPIC
238 CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
239
240 -LDFLAGS_COMMON=$(LDFLAGS)
241 -LXXFLAGS_COMMON=$(LDFLAGS) -lstdc++ -lsupc++
242 +LDFLAGS_COMMON=
243 +LXXFLAGS_COMMON=-lstdc++ -lsupc++
244
245 ifeq ($(OS),FreeBSD)
246 LDFLAGS_COMMON+= -L/usr/local/lib -lm -pthread
247 else
248 -LDFLAGS_COMMON+= -L/usr/local/lib -ldl -lm -O1 -Wl,--as-needed
249 +LDFLAGS_COMMON+= -ldl -lm
250 endif
251
252 ifneq ($(DEBUG_BUILD),YES)
253 -LDFLAGS_COMMON+= -s
254 -LXXFLAGS_COMMON+= -s
255 +LDFLAGS_COMMON+=
256 +LXXFLAGS_COMMON+=
257 endif
258
259 ifeq ($(ARCH),x86_64)
260 @@ -298,12 +315,19 @@
261 ######################################################################################################
262 # Helper functions
263 ######################################################################################################
264 +ifneq ($(V),YES)
265 DO_CC=echo " > Compiling $<" && \
266 - $(CC) $(CFLAGS_COMMON) -c $< -o $@
267 + $(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@
268 DO_CXX=echo " > Compiling (c++) $<" && \
269 - $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
270 + $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@
271 DO_RES=echo " > Compiling resource $<" && \
272 - $(RES) $(RESFLAGS_COMMON) -i $< -o $@
273 + $(RES) $(RESFLAGS_COMMON) -i $< -o $@
274 +else
275 +DO_CC=$(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@
276 +DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@
277 +DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@
278 +endif
279 +
280
281 DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
282 DO_CC_DED=$(DO_CC) $(CFLAGS_DED)
283 @@ -505,17 +529,17 @@
284
285 all: client openal qf ded cgame game ui irc cin angelwrap tv_server
286
287 -client: $(BUILDDIRS) message-client compile-client link-client start-script-client
288 +client: $(BUILDDIRS) message-client compile-client link-client
289 openal: $(BUILDDIRS) message-openal compile-openal link-openal
290 qf: $(BUILDDIRS) message-qf compile-qf link-qf
291 -ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded
292 +ded: $(BUILDDIRS) message-ded compile-ded link-ded
293 cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame
294 game: $(BUILDDIRS) message-game compile-game link-game
295 ui: $(BUILDDIRS) message-ui compile-ui link-ui
296 irc: $(BUILDDIRS) message-irc compile-irc link-irc
297 cin: $(BUILDDIRS) message-cin compile-cin link-cin
298 angelwrap: $(BUILDDIRS) message-angelwrap compile-angelwrap link-angelwrap
299 -tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server start-script-tv_server
300 +tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server
301
302 clean: clean-msg clean-depend clean-client clean-openal clean-qf clean-ded clean-cgame clean-game clean-ui clean-librocket clean-irc clean-cin clean-angelwrap clean-tv_server
303
304 @@ -609,7 +633,14 @@
305 @echo "> *********************************************************"
306 @echo "> * Building ui"
307 @echo "> *********************************************************"
308 +
309 +ifneq ($(SYSTEM_LIBS),YES)
310 compile-ui: $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
311 +$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB)
312 +else
313 +compile-ui: $(OBJS_UI_ROCKET)
314 +endif
315 +
316 link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
317 clean-ui:
318 @echo " > Removing ui objects" && \
319 @@ -617,7 +648,7 @@
320
321 $(LIBROCKET_LIB):
322 @echo "> * Building Rocket library"
323 - @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD)
324 + @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD)
325 @echo "> * Done building RocketCore library."
326 @echo "> *********************************************************"
327 @echo "> * Continuing ui building..."
328 @@ -656,7 +687,6 @@
329 @echo "> *********************************************************"
330 @echo "> * Building angelwrap"
331 @echo "> *********************************************************"
332 - -@rm $(ANGELSCRIPT_LIB)
333 $(ANGELSCRIPT_INC)/angelscript.h:
334 @echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
335 @echo "!!!"
336 @@ -668,7 +698,7 @@
337
338 $(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h
339 @echo "> * Building Angelscript library first"
340 - @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
341 + @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
342 @echo "> * Done building angelscript library."
343 @echo "> *********************************************************"
344 @echo "> * Continuing angelwrap building..."
345 @@ -702,69 +732,69 @@
346 # DED
347 ########
348 $(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
349 - @echo " > Linking $@" && \
350 - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
351 + @echo " > Linking $@"
352 + $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
353
354 #########
355 # CLIENT
356 #########
357 ifeq ($(OS),Darwin)
358 $(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
359 - @echo " > Linking $@" && \
360 - $(LD) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
361 + @echo " > Linking $@"
362 + $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
363 else
364 $(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
365 - @echo " > Linking $@" && \
366 - $(LD) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
367 + @echo " > Linking $@"
368 + $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
369 endif
370
371 #########
372 # OPENAL
373 #########
374 $(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL)
375 - @echo " > Linking $@" && \
376 - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
377 + @echo " > Linking $@"
378 + $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
379
380 #########
381 # QF
382 #########
383 $(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF)
384 - @echo " > Linking $@" && \
385 - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
386 + @echo " > Linking $@"
387 + $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
388
389 ########
390 # .SO
391 ########
392 $(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME)
393 - @echo " > Linking $@" && \
394 - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
395 + @echo " > Linking $@"
396 + $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
397
398 $(BINDIR)/basewsw/game_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_GAME)
399 - @echo " > Linking $@" && \
400 - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
401 + @echo " > Linking $@"
402 + $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
403
404 $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET)
405 - @echo " > Linking $@" && \
406 - $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
407 + @echo " > Linking $@"
408 + $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
409
410 $(BINDIR)/libs/irc_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_IRC)
411 - @echo " > Linking $@" && \
412 - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC)
413 + @echo " > Linking $@"
414 + $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC)
415
416 $(BINDIR)/libs/cin_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CIN)
417 - @echo " > Linking $@" && \
418 - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN)
419 + @echo " > Linking $@"
420 + $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN)
421
422 $(BINDIR)/libs/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP)
423 - @echo " > Linking $@" && \
424 - $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
425 + @echo " > Linking $@"
426 + $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
427
428 ########
429 # TV
430 ########
431 $(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER)
432 - @echo " > Linking $@" && \
433 - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
434 + @echo " > Linking $@"
435 + $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
436
437 ######################################################################################################
438 # Meta Rules
439 @@ -776,229 +806,229 @@
440 # CLIENT
441 ########
442 $(BUILDDIR)/client/%.o: qcommon/%.c
443 - @$(DO_CC_CLIENT)
444 + $(Q)$(DO_CC_CLIENT)
445
446 $(BUILDDIR)/client/%.o: server/%.c
447 - @$(DO_CC_CLIENT)
448 + $(Q)$(DO_CC_CLIENT)
449
450 $(BUILDDIR)/client/%.o: client/%.c
451 - @$(DO_CC_CLIENT)
452 + $(Q)$(DO_CC_CLIENT)
453
454 $(BUILDDIR)/client/%.o: ref_gl/%.c
455 - @$(DO_CC_CLIENT)
456 + $(Q)$(DO_CC_CLIENT)
457
458 $(BUILDDIR)/client/%.o: null/%.c
459 - @$(DO_CC_CLIENT)
460 + $(Q)$(DO_CC_CLIENT)
461
462 $(BUILDDIR)/client/%.o: matchmaker/%.c
463 - @$(DO_CC_CLIENT)
464 + $(Q)$(DO_CC_CLIENT)
465
466 ifeq ($(USE_MINGW),YES)
467 $(BUILDDIR)/client/%.o: win32/%.c
468 - @$(DO_CC_CLIENT)
469 + $(Q)$(DO_CC_CLIENT)
470
471 $(BUILDDIR)/client/%.o: win32/%.rc
472 - @$(DO_RES_CLIENT)
473 + $(Q)$(DO_RES_CLIENT)
474 else
475 ifeq ($(OS),Darwin)
476 $(BUILDDIR)/client/%.o: mac/%.c
477 - @$(DO_CC_CLIENT)
478 + $(Q)$(DO_CC_CLIENT)
479 $(BUILDDIR)/client/%.o: unix/%.c
480 - @$(DO_CC_CLIENT)
481 + $(Q)$(DO_CC_CLIENT)
482 else
483 $(BUILDDIR)/client/%.o: unix/%.c
484 - @$(DO_CC_CLIENT)
485 + $(Q)$(DO_CC_CLIENT)
486 endif
487 endif
488
489 $(BUILDDIR)/client/%.o: game/%.c
490 - @$(DO_CC_CLIENT)
491 + $(Q)$(DO_CC_CLIENT)
492
493 $(BUILDDIR)/client/%.o: gameshared/%.c
494 - @$(DO_CC_DED)
495 + $(Q)$(DO_CC_DED)
496
497 $(BINDIR)/warsow: unix/start_script.sh
498 - @echo " > Installing client start script" && \
499 - cp $< $@ && \
500 + @echo " > Installing client start script"
501 + $(Q)cp $< $@ && \
502 chmod a+x $@
503
504 ########
505 # OPENAL
506 ########
507 $(BUILDDIR)/openal/%.o: snd_openal/%.c
508 - @$(DO_CC_MODULE) $(CFLAGS_OPENAL)
509 + $(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL)
510
511 $(BUILDDIR)/openal/%.o: gameshared/%.c
512 - @$(DO_CC_MODULE)
513 + $(Q)$(DO_CC_MODULE)
514
515 ########
516 # QF
517 ########
518 $(BUILDDIR)/qf/%.o: snd_qf/%.c
519 - @$(DO_CC_MODULE) $(CFLAGS_QF)
520 + $(Q)$(DO_CC_MODULE) $(CFLAGS_QF)
521
522 ifeq ($(USE_MINGW),YES)
523 $(BUILDDIR)/qf/win_snd.o: win32/win_snd.c
524 - @$(DO_CC_MODULE) $(CFLAGS_DSOUND)
525 + $(Q)$(DO_CC_MODULE) $(CFLAGS_DSOUND)
526 else
527 $(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c
528 - @$(DO_CC_MODULE) $(CFLAGS_SDL)
529 + $(Q)$(DO_CC_MODULE) $(CFLAGS_SDL)
530 endif
531
532 $(BUILDDIR)/qf/%.o: gameshared/%.c
533 - @$(DO_CC_MODULE)
534 + $(Q)$(DO_CC_MODULE)
535
536
537 ########
538 # DED
539 ########
540 $(BUILDDIR)/ded/%.o: qcommon/%.c
541 - @$(DO_CC_DED)
542 + $(Q)$(DO_CC_DED)
543
544 $(BUILDDIR)/ded/%.o: server/%.c
545 - @$(DO_CC_DED)
546 + $(Q)$(DO_CC_DED)
547
548 ifeq ($(USE_MINGW),YES)
549 $(BUILDDIR)/ded/%.o: win32/%.c
550 - @$(DO_CC_DED)
551 + $(Q)$(DO_CC_DED)
552 else
553 $(BUILDDIR)/ded/%.o: unix/%.c
554 - @$(DO_CC_DED)
555 + $(Q)$(DO_CC_DED)
556 endif
557
558 $(BUILDDIR)/ded/%.o: null/%.c
559 - @$(DO_CC_DED)
560 + $(Q)$(DO_CC_DED)
561
562 $(BUILDDIR)/ded/%.o: game/%.c
563 - @$(DO_CC_DED)
564 + $(Q)$(DO_CC_DED)
565
566 $(BUILDDIR)/ded/%.o: gameshared/%.c
567 - @$(DO_CC_DED)
568 + $(Q)$(DO_CC_DED)
569
570 $(BUILDDIR)/ded/%.o: matchmaker/%.c
571 - @$(DO_CC_DED)
572 + $(Q)$(DO_CC_DED)
573
574 $(BINDIR)/wsw_server: unix/start_script.sh
575 - @echo " > Installing dedicated server start script" && \
576 - cp $< $@ && \
577 + @echo " > Installing dedicated server start script"
578 + $(Q)cp $< $@ && \
579 chmod a+x $@
580
581 ########
582 # CGAME
583 ########
584 $(BUILDDIR)/cgame/%.o: cgame/%.c
585 - @$(DO_CC_MODULE)
586 + $(Q)$(DO_CC_MODULE)
587
588 $(BUILDDIR)/cgame/%.o: gameshared/%.c
589 - @$(DO_CC_MODULE)
590 + $(Q)$(DO_CC_MODULE)
591
592 ########
593 # GAME
594 ########
595 $(BUILDDIR)/game/%.o: game/%.c
596 - @$(DO_CC_MODULE)
597 + $(Q)$(DO_CC_MODULE)
598
599 $(BUILDDIR)/game/%.o: game/ai/%.c
600 - @$(DO_CC_MODULE)
601 + $(Q)$(DO_CC_MODULE)
602
603 $(BUILDDIR)/game/%.o: gameshared/%.c
604 - @$(DO_CC_MODULE)
605 + $(Q)$(DO_CC_MODULE)
606
607 $(BUILDDIR)/game/%.o: matchmaker/%.c
608 - @$(DO_CC_MODULE)
609 + $(Q)$(DO_CC_MODULE)
610
611 ########
612 # UI.ROCKET
613 ########
614 $(BUILDDIR)/ui/%.o: gameshared/%.c
615 - @$(DO_CC_MODULE)
616 + $(Q)$(DO_CC_MODULE)
617
618 $(BUILDDIR)/ui/%.o: ui/%.cpp
619 - @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
620 + $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
621
622 $(BUILDDIR)/ui/%.o: ui/kernel/%.cpp
623 - @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
624 + $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
625
626 $(BUILDDIR)/ui/%.o: ui/as/%.cpp
627 - @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
628 + $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
629
630 $(BUILDDIR)/ui/%.o: ui/datasources/%.cpp
631 - @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
632 + $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
633
634 $(BUILDDIR)/ui/%.o: ui/widgets/%.cpp
635 - @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
636 + $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
637
638 $(BUILDDIR)/ui/%.o: ui/decorators/%.cpp
639 - @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
640 + $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
641
642 #$(BUILDDIR)/ui.as/%.o: matchmaker/%.c
643 -# @$(DO_CC_MODULE)
644 +# $(DO_CC_MODULE)
645
646 ########
647 # IRC
648 ########
649 $(BUILDDIR)/irc/%.o: gameshared/%.c
650 - @$(DO_CC_MODULE)
651 + $(Q)$(DO_CC_MODULE)
652
653 $(BUILDDIR)/irc/%.o: irc/%.c
654 - @$(DO_CC_MODULE)
655 + $(Q)$(DO_CC_MODULE)
656
657 ########
658 # CIN
659 ########
660 $(BUILDDIR)/cin/%.o: gameshared/%.c
661 - @$(DO_CC_MODULE)
662 + $(Q)$(DO_CC_MODULE)
663
664 $(BUILDDIR)/cin/%.o: cin/%.c
665 - @$(DO_CC_MODULE) $(CFLAGS_CIN)
666 + $(Q)$(DO_CC_MODULE) $(CFLAGS_CIN)
667
668 ########
669 # ANGELWRAP
670 ########
671 $(BUILDDIR)/angelwrap/%.o: gameshared/%.c
672 - @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
673 + $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
674
675 $(BUILDDIR)/angelwrap/%.o: angelwrap/%.c
676 - @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
677 + $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
678
679 $(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp
680 - @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
681 + $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
682
683 $(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.cpp
684 - @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
685 + $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
686
687 ########
688 # TV SERVER
689 ########
690 $(BUILDDIR)/tv_server/%.o: qcommon/%.c
691 - @$(DO_CC_TV_SERVER)
692 + $(Q)$(DO_CC_TV_SERVER)
693
694 $(BUILDDIR)/tv_server/%.o: client/%.c
695 - @$(DO_CC_TV_SERVER)
696 + $(Q)$(DO_CC_TV_SERVER)
697
698 $(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c
699 - @$(DO_CC_TV_SERVER)
700 + $(Q)$(DO_CC_TV_SERVER)
701
702 $(BUILDDIR)/tv_server/%.o: tv_server/%.c
703 - @$(DO_CC_TV_SERVER)
704 + $(Q)$(DO_CC_TV_SERVER)
705
706 ifeq ($(USE_MINGW),YES)
707 $(BUILDDIR)/tv_server/%.o: win32/%.c
708 - @$(DO_CC_TV_SERVER)
709 + $(Q)$(DO_CC_TV_SERVER)
710 else
711 $(BUILDDIR)/tv_server/%.o: unix/%.c
712 - @$(DO_CC_TV_SERVER)
713 + $(Q)$(DO_CC_TV_SERVER)
714 endif
715
716 $(BUILDDIR)/tv_server/%.o: null/%.c
717 - @$(DO_CC_TV_SERVER)
718 + $(Q)$(DO_CC_TV_SERVER)
719
720 $(BUILDDIR)/tv_server/%.o: gameshared/%.c
721 - @$(DO_CC_TV_SERVER)
722 + $(Q)$(DO_CC_TV_SERVER)
723
724 $(BINDIR)/wswtv_server: unix/start_script.sh
725 - @echo " > Installing TV server start script" && \
726 - cp $< $@ && \
727 + @echo " > Installing TV server start script"
728 + $(Q)cp $< $@ && \
729 chmod a+x $@
730
731 ######################################################################################################
732 --- libsrcs/libRocket/libRocket/Makefile.warsow
733 +++ libsrcs/libRocket/libRocket/Makefile.warsow
734 @@ -13,9 +13,9 @@
735 endif
736
737 ifeq ($(DEBUG_BUILD),YES)
738 - CXXFLAGS += -g -DROCKET_DEBUG
739 + CXXFLAGS += -DROCKET_DEBUG
740 else
741 - CXXFLAGS += -O2
742 + CXXFLAGS +=
743 endif
744
745 BUILDDIR=Build/obj
746 --- libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
747 +++ libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
748 @@ -47,7 +47,7 @@
749 CXX ?= gcc
750 # On i686 architecture you may need to add -march=i686 if you get
751 # an undefined symbol for __sync_sub_and_fetch_4 in as_atomic.cpp.
752 - CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
753 + CXXFLAGS += -Wall -fPIC -fno-strict-aliasing
754 endif
755
756 AR ?= ar
757
758
759
760 1.1 games-fps/warsow/files/warsow-1.03-pic.patch
761
762 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/warsow-1.03-pic.patch?rev=1.1&view=markup
763 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/warsow-1.03-pic.patch?rev=1.1&content-type=text/plain
764
765 Index: warsow-1.03-pic.patch
766 ===================================================================
767 --- source/snd_qf/snd_mix.c
768 +++ source/snd_qf/snd_mix.c
769 @@ -27,7 +27,7 @@
770 int *snd_p, snd_linear_count, snd_vol, music_vol;
771 short *snd_out;
772
773 -#if !defined ( id386 ) || defined ( __MACOSX__ )
774 +#if defined ( PIC ) || !defined ( id386 ) || defined ( __MACOSX__ )
775 #ifdef _WIN32
776 #pragma warning( push )
777 #pragma warning( disable : 4310 ) // cast truncates constant value
778
779
780
781 1.1 games-fps/warsow/files/03-warsow-1.03-clang.patch
782
783 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/03-warsow-1.03-clang.patch?rev=1.1&view=markup
784 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/03-warsow-1.03-clang.patch?rev=1.1&content-type=text/plain
785
786 Index: 03-warsow-1.03-clang.patch
787 ===================================================================
788 From: Julian Ospald <hasufell@g.o>
789 Date: Sat Nov 9 12:01:14 UTC 2013
790 Subject: fix clang warnings
791
792 based on
793 https://github.com/viciious/qfusion/commit/792e50cc9b55e0c5e4c954a1c0c4e4a61ad54e2c.patch
794
795 --- a/source/cgame/cg_draw.c
796 +++ b/source/cgame/cg_draw.c
797 @@ -309,7 +309,7 @@ void CG_DrawMiniMap( int x, int y, int i
798 coords[2] = ( coords[2] + (float)z_lefttop ) / (float)map_z;
799
800 // is it a player?
801 - if( ( cent->current.type == ET_PLAYER ) )
802 + if( cent->current.type == ET_PLAYER )
803 {
804 int box_size = (int)( 3.0 + coords[2] * 10.0 );
805
806 --- a/source/cgame/cg_ents.c
807 +++ b/source/cgame/cg_ents.c
808 @@ -376,7 +376,6 @@ static void CG_UpdatePlayerState( void )
809 // set up the playerstates
810
811 // current
812 - index = index;
813 CG_SetFramePlayerState( &cg.frame, index );
814
815 // old
816 --- a/source/client/console.c
817 +++ b/source/client/console.c
818 @@ -1343,7 +1343,7 @@ void Con_KeyDown( int key )
819 return;
820 }
821
822 - if( ( key == K_BACKSPACE ) )
823 + if( key == K_BACKSPACE )
824 {
825 if( key_linepos > 1 )
826 {
Report Message
Find on MARC Find on Google Groups