| 1 |
tupone 10/10/08 12:55:49 |
| 2 |
|
| 3 |
Added: duke3d-20040817-ldflags.patch |
| 4 |
Log: |
| 5 |
Respect LDFLAGS. Bug #336000 |
| 6 |
|
| 7 |
(Portage version: 2.1.9.13/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-fps/duke3d/files/duke3d-20040817-ldflags.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/duke3d/files/duke3d-20040817-ldflags.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/duke3d/files/duke3d-20040817-ldflags.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: duke3d-20040817-ldflags.patch |
| 16 |
=================================================================== |
| 17 |
--- source/buildengine/Makefile.old 2010-10-08 14:32:05.000000000 +0200 |
| 18 |
+++ source/buildengine/Makefile 2010-10-08 14:35:10.000000000 +0200 |
| 19 |
@@ -73,7 +73,7 @@ |
| 20 |
endif |
| 21 |
|
| 22 |
ifeq ($(strip $(solaris)),true) |
| 23 |
- LDFLAGS += -lsocket -lnsl |
| 24 |
+ LIBS += -lsocket -lnsl |
| 25 |
CFLAGS += -DPLATFORM_SOLARIS |
| 26 |
endif |
| 27 |
|
| 28 |
@@ -129,7 +129,7 @@ |
| 29 |
|
| 30 |
ifeq ($(strip $(macosx)),true) |
| 31 |
CFLAGS += -DPLATFORM_MACOSX=1 -faltivec -falign-loops=32 -falign-functions=32 |
| 32 |
- LDFLAGS += -framework AppKit -lSDL -lSDLmain |
| 33 |
+ LIBS += -framework AppKit -lSDL -lSDLmain |
| 34 |
endif |
| 35 |
|
| 36 |
ifeq ($(strip $(useopengl)),true) |
| 37 |
@@ -146,7 +146,7 @@ |
| 38 |
|
| 39 |
ifeq ($(strip $(usephysfs)),true) |
| 40 |
CFLAGS += -DUSE_PHYSICSFS |
| 41 |
- LDFLAGS += -lphysfs |
| 42 |
+ LIBS += -lphysfs |
| 43 |
endif |
| 44 |
|
| 45 |
ifeq ($(strip $(usedlls)),true) |
| 46 |
@@ -236,17 +236,17 @@ |
| 47 |
|
| 48 |
ifeq ($(strip $(usedlls)),true) |
| 49 |
$(ENGINEDLL) : $(ENGINEOBJS) |
| 50 |
- $(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS) $(LDLIBS) |
| 51 |
+ $(LINKER) -shared -o $(ENGINEDLL) $(LIBS) $(ENGINEOBJS) $(LDLIBS) |
| 52 |
|
| 53 |
$(NETDLL) : $(NETOBJS) |
| 54 |
- $(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS) $(LDLIBS) |
| 55 |
+ $(LINKER) -shared -o $(NETDLL) $(LIBS) $(NETOBJS) $(LDLIBS) |
| 56 |
endif |
| 57 |
|
| 58 |
$(GAMEEXE) : $(ENGINEDLL) $(NETDLL) $(GAMEOBJS) $(PERLOBJS) |
| 59 |
- $(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(PERLOBJS) $(GAMEOBJS) $(LDPERL) $(LDLIBS) $(ENGINEDLL) $(NETDLL) |
| 60 |
+ $(LINKER) $(LDFLAGS) -o $(GAMEEXE) $(LIBS) $(PERLOBJS) $(GAMEOBJS) $(LDPERL) $(LDLIBS) $(ENGINEDLL) $(NETDLL) |
| 61 |
|
| 62 |
$(BUILDEXE) : $(ENGINEDLL) $(BUILDOBJS) |
| 63 |
- $(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(LDLIBS) $(ENGINEDLL) |
| 64 |
+ $(LINKER) $(LDFLAGS) -o $(BUILDEXE) $(LIBS) $(BUILDOBJS) $(LDLIBS) $(ENGINEDLL) |
| 65 |
|
| 66 |
listclean: |
| 67 |
@echo "A 'make clean' would remove" $(CLEANUP) |
| 68 |
--- source/Makefile.old 2010-10-08 14:35:54.000000000 +0200 |
| 69 |
+++ source/Makefile 2010-10-08 14:37:34.000000000 +0200 |
| 70 |
@@ -152,10 +152,10 @@ |
| 71 |
sounds.o \ |
| 72 |
dukemusc.o \ |
| 73 |
audiolib/audiolib.a |
| 74 |
- $(CC) $^ $(BUILDOBJS) $(LDLIBS) -o $@ |
| 75 |
+ $(CC) $(LDFLAGS) $^ $(BUILDOBJS) $(LDLIBS) -o $@ |
| 76 |
|
| 77 |
build: astub.o |
| 78 |
- $(CC) $^ $(BUILDOBJS) buildengine/build.o $(LDLIBS) -o $@ |
| 79 |
+ $(CC) $(LDFLAGS) $^ $(BUILDOBJS) buildengine/build.o $(LDLIBS) -o $@ |
| 80 |
|
| 81 |
clean: |
| 82 |
$(MAKE) -C audiolib clean |
Archives