| 1 |
hasufell 14/01/27 00:00:21 |
| 2 |
|
| 3 |
Added: urbanterror-4.2.017-build.patch |
| 4 |
Log: |
| 5 |
version bump |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-fps/urbanterror/files/urbanterror-4.2.017-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.017-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.017-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: urbanterror-4.2.017-build.patch |
| 16 |
=================================================================== |
| 17 |
Author: hasufell <hasufell@g.o> |
| 18 |
Date: Wed Jul 10 01:25:27 2013 +0200 |
| 19 |
|
| 20 |
respect CFLAGS/LDFLAGS |
| 21 |
|
| 22 |
--- a/Makefile |
| 23 |
+++ b/Makefile |
| 24 |
@@ -213,7 +213,7 @@ |
| 25 |
endif |
| 26 |
endif |
| 27 |
|
| 28 |
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe |
| 29 |
+ BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes |
| 30 |
|
| 31 |
ifeq ($(USE_OPENAL),1) |
| 32 |
BASE_CFLAGS += -DUSE_OPENAL=1 |
| 33 |
@@ -239,19 +239,15 @@ |
| 34 |
BASE_CFLAGS += -I/usr/X11R6/include |
| 35 |
endif |
| 36 |
|
| 37 |
- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer |
| 38 |
+ OPTIMIZE = |
| 39 |
|
| 40 |
ifeq ($(ARCH),x86_64) |
| 41 |
- OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \ |
| 42 |
- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \ |
| 43 |
- -fstrength-reduce |
| 44 |
+ OPTIMIZE = |
| 45 |
# experimental x86_64 jit compiler! you need GNU as |
| 46 |
HAVE_VM_COMPILED = true |
| 47 |
else |
| 48 |
ifeq ($(ARCH),i386) |
| 49 |
- OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \ |
| 50 |
- -funroll-loops -falign-loops=2 -falign-jumps=2 \ |
| 51 |
- -falign-functions=2 -fstrength-reduce |
| 52 |
+ OPTIMIZE = |
| 53 |
HAVE_VM_COMPILED=true |
| 54 |
else |
| 55 |
ifeq ($(ARCH),ppc) |
| 56 |
@@ -265,7 +261,7 @@ |
| 57 |
BASE_CFLAGS += -DNO_VM_COMPILED |
| 58 |
endif |
| 59 |
|
| 60 |
- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 |
| 61 |
+ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE) |
| 62 |
|
| 63 |
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) |
| 64 |
|
| 65 |
@@ -274,7 +270,7 @@ |
| 66 |
SHLIBLDFLAGS=-shared $(LDFLAGS) |
| 67 |
|
| 68 |
THREAD_LDFLAGS=-lpthread |
| 69 |
- LDFLAGS=-ldl -lm |
| 70 |
+ LDFLAGS+=-ldl -lm |
| 71 |
|
| 72 |
ifeq ($(USE_SDL),1) |
| 73 |
CLIENT_LDFLAGS=$(shell sdl-config --libs) |
| 74 |
@@ -1158,13 +1154,13 @@ |
| 75 |
|
| 76 |
$(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) |
| 77 |
$(echo_cmd) "LD $@" |
| 78 |
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \ |
| 79 |
- $(LDFLAGS) $(LIBSDLMAIN) |
| 80 |
+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \ |
| 81 |
+ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) |
| 82 |
|
| 83 |
$(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) |
| 84 |
$(echo_cmd) "LD $@" |
| 85 |
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ |
| 86 |
- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) |
| 87 |
+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \ |
| 88 |
+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) |
| 89 |
|
| 90 |
ifneq ($(strip $(LIBSDLMAIN)),) |
| 91 |
ifneq ($(strip $(LIBSDLMAINSRC)),) |
Archives