| 1 |
mr_bones_ 08/02/28 03:24:24 |
| 2 |
|
| 3 |
Added: duke3d-20040817-as-needed.patch |
| 4 |
Log: |
| 5 |
add patch for --as-needed support from Harald van Dijk (bug #211679) |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-fps/duke3d/files/duke3d-20040817-as-needed.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/duke3d/files/duke3d-20040817-as-needed.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/duke3d/files/duke3d-20040817-as-needed.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: duke3d-20040817-as-needed.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur duke3d/source/buildengine/Makefile duke3d-patched/source/buildengine/Makefile |
| 17 |
--- duke3d/source/buildengine/Makefile 2004-05-15 05:15:05.000000000 +0200 |
| 18 |
+++ duke3d-patched/source/buildengine/Makefile 2008-02-27 23:10:46.000000000 +0100 |
| 19 |
@@ -99,11 +99,11 @@ |
| 20 |
ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users) |
| 21 |
$(error Cygwin users need to set the SDL_LIB_DIR envr var.) |
| 22 |
else |
| 23 |
- SDL_LDFLAGS := -L$(SDL_LIB_DIR) -lSDL |
| 24 |
+ SDL_LIBS := -L$(SDL_LIB_DIR) -lSDL |
| 25 |
endif |
| 26 |
else |
| 27 |
SDL_CFLAGS := $(shell sdl-config --cflags) |
| 28 |
- SDL_LDFLAGS := $(shell sdl-config --libs) |
| 29 |
+ SDL_LIBS := $(shell sdl-config --libs) |
| 30 |
endif |
| 31 |
|
| 32 |
CC = gcc |
| 33 |
@@ -202,7 +202,7 @@ |
| 34 |
ASMFLAGS = -f $(ASMOBJFMT) $(ASMDEFS) |
| 35 |
LINKER = gcc |
| 36 |
CFLAGS += $(USE_ASM) -funsigned-char -DPLATFORM_UNIX -Wall $(SDL_CFLAGS) -fno-omit-frame-pointer |
| 37 |
-LDFLAGS += $(SDL_LDFLAGS) |
| 38 |
+LDLIBS += $(SDL_LIBS) |
| 39 |
|
| 40 |
# Rules for turning source files into .o files |
| 41 |
%.o: %.c |
| 42 |
@@ -236,17 +236,17 @@ |
| 43 |
|
| 44 |
ifeq ($(strip $(usedlls)),true) |
| 45 |
$(ENGINEDLL) : $(ENGINEOBJS) |
| 46 |
- $(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS) |
| 47 |
+ $(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS) $(LDLIBS) |
| 48 |
|
| 49 |
$(NETDLL) : $(NETOBJS) |
| 50 |
- $(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS) |
| 51 |
+ $(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS) $(LDLIBS) |
| 52 |
endif |
| 53 |
|
| 54 |
$(GAMEEXE) : $(ENGINEDLL) $(NETDLL) $(GAMEOBJS) $(PERLOBJS) |
| 55 |
- $(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(LDPERL) $(PERLOBJS) $(GAMEOBJS) $(ENGINEDLL) $(NETDLL) |
| 56 |
+ $(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(LDPERL) $(PERLOBJS) $(GAMEOBJS) $(LDLIBS) $(ENGINEDLL) $(NETDLL) |
| 57 |
|
| 58 |
$(BUILDEXE) : $(ENGINEDLL) $(BUILDOBJS) |
| 59 |
- $(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(ENGINEDLL) |
| 60 |
+ $(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(LDLIBS) $(ENGINEDLL) |
| 61 |
|
| 62 |
listclean: |
| 63 |
@echo "A 'make clean' would remove" $(CLEANUP) |
| 64 |
diff -ur duke3d/source/Makefile duke3d-patched/source/Makefile |
| 65 |
--- duke3d/source/Makefile 2004-05-15 05:14:16.000000000 +0200 |
| 66 |
+++ duke3d-patched/source/Makefile 2008-02-27 23:09:57.000000000 +0100 |
| 67 |
@@ -45,11 +45,11 @@ |
| 68 |
ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users) |
| 69 |
$(error Cygwin users need to set the SDL_LIB_DIR envr var.) |
| 70 |
else |
| 71 |
- SDL_LDFLAGS := -L$(SDL_LIB_DIR) -lSDL |
| 72 |
+ SDL_LIBS := -L$(SDL_LIB_DIR) -lSDL |
| 73 |
endif |
| 74 |
else |
| 75 |
SDL_CFLAGS := $(shell sdl-config --cflags) |
| 76 |
- SDL_LDFLAGS := $(shell sdl-config --libs) -L. |
| 77 |
+ SDL_LIBS := $(shell sdl-config --libs) -L. |
| 78 |
endif |
| 79 |
|
| 80 |
ifeq ($(strip $(macosx)),true) |
| 81 |
@@ -104,7 +104,7 @@ |
| 82 |
#CC = icc |
| 83 |
#CFLAGS = -g $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -DUSE_I386_ASM=1 $(EXTRACFLAGS) -O2 |
| 84 |
|
| 85 |
-LDLIBS = $(SDL_LDFLAGS) -lSDL -lSDL_mixer $(EXTRALDFLAGS) |
| 86 |
+LDLIBS = $(SDL_LIBS) -lSDL -lSDL_mixer $(EXTRALDFLAGS) |
| 87 |
|
| 88 |
# !!! FIXME: Do we even need this? It doesn't fly on MacOS X. --ryan. |
| 89 |
#LDLIBS += -Wl,-E |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
-- |
| 94 |
gentoo-commits@l.g.o mailing list |
Archives