| 1 |
tupone 10/10/08 10:53:01 |
| 2 |
|
| 3 |
Added: xshipwars-2.6.1-ldflags.patch |
| 4 |
Log: |
| 5 |
Respect LDFLAGS. Bug #336822 |
| 6 |
|
| 7 |
(Portage version: 2.1.9.13/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-action/xshipwars/files/xshipwars-2.6.1-ldflags.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/xshipwars/files/xshipwars-2.6.1-ldflags.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/xshipwars/files/xshipwars-2.6.1-ldflags.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: xshipwars-2.6.1-ldflags.patch |
| 16 |
=================================================================== |
| 17 |
--- Makefile.unvedit.old 2010-10-08 11:39:09.000000000 +0200 |
| 18 |
+++ Makefile.unvedit 2010-10-08 11:42:48.000000000 +0200 |
| 19 |
@@ -1,5 +1,5 @@ |
| 20 |
ALL_SRC_DIRS=unvedit |
| 21 |
all install clean: |
| 22 |
@for subdir in $(ALL_SRC_DIRS); do \ |
| 23 |
- make -C $$subdir -f Makefile $@; \ |
| 24 |
+ $(MAKE) -C $$subdir -f Makefile $@; \ |
| 25 |
done |
| 26 |
--- unvedit/makefile_append.ini.old 2010-10-08 11:53:21.000000000 +0200 |
| 27 |
+++ unvedit/makefile_append.ini 2010-10-08 11:54:43.000000000 +0200 |
| 28 |
@@ -14,7 +14,7 @@ |
| 29 |
OBJ_CPP = $(SRC_CPP:.cpp=.o) |
| 30 |
.cpp.o: |
| 31 |
@echo "Compiling module $*.o" |
| 32 |
- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) |
| 33 |
+ +$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) |
| 34 |
|
| 35 |
# Programs |
| 36 |
LS = ls |
| 37 |
@@ -29,8 +29,8 @@ |
| 38 |
@echo "Compiling resources" |
| 39 |
|
| 40 |
modules: $(OBJ_C) $(OBJ_CPP) |
| 41 |
- @echo -n "Linking modules..." |
| 42 |
- @$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS) |
| 43 |
+ @echo "Linking modules..." |
| 44 |
+ $(CPP) $(LDFLAGS) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS) |
| 45 |
@echo -n " " |
| 46 |
@-$(LS) $(LSFLAGS) $(BIN) |
| 47 |
|
| 48 |
--- Makefile.monitor.old 2010-10-08 12:25:11.000000000 +0200 |
| 49 |
+++ Makefile.monitor 2010-10-08 12:25:25.000000000 +0200 |
| 50 |
@@ -1,5 +1,5 @@ |
| 51 |
ALL_SRC_DIRS=monitor |
| 52 |
all install clean: |
| 53 |
@for subdir in $(ALL_SRC_DIRS); do \ |
| 54 |
- make -C $$subdir -f Makefile $@; \ |
| 55 |
+ $(MAKE) -C $$subdir -f Makefile $@; \ |
| 56 |
done |
| 57 |
--- monitor/makefile_append.ini.old 2010-10-08 12:26:24.000000000 +0200 |
| 58 |
+++ monitor/makefile_append.ini 2010-10-08 12:26:56.000000000 +0200 |
| 59 |
@@ -14,7 +14,7 @@ |
| 60 |
OBJ_CPP = $(SRC_CPP:.cpp=.o) |
| 61 |
.cpp.o: |
| 62 |
@echo "Compiling module $*.o" |
| 63 |
- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) |
| 64 |
+ +$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) |
| 65 |
|
| 66 |
# Programs |
| 67 |
LS = ls |
| 68 |
@@ -29,8 +29,8 @@ |
| 69 |
@echo "Compiling resources" |
| 70 |
|
| 71 |
modules: $(OBJ_C) $(OBJ_CPP) |
| 72 |
- @echo -n "Linking modules..." |
| 73 |
- @$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS) |
| 74 |
+ @echo "Linking modules..." |
| 75 |
+ $(CPP) $(LDFLAGS) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS) |
| 76 |
@echo -n " " |
| 77 |
@-$(LS) $(LSFLAGS) $(BIN) |
| 78 |
|
| 79 |
--- client/makefile_append.ini.old 2010-10-08 12:37:44.000000000 +0200 |
| 80 |
+++ client/makefile_append.ini 2010-10-08 12:38:08.000000000 +0200 |
| 81 |
@@ -14,7 +14,7 @@ |
| 82 |
OBJ_CPP = $(SRC_CPP:.cpp=.o) |
| 83 |
.cpp.o: |
| 84 |
@echo "Compiling module $*.o" |
| 85 |
- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) |
| 86 |
+ +$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) |
| 87 |
|
| 88 |
# Programs |
| 89 |
LS = ls |
| 90 |
@@ -29,8 +29,8 @@ |
| 91 |
@echo "Compiling resources" |
| 92 |
|
| 93 |
modules: $(OBJ_C) $(OBJ_CPP) |
| 94 |
- @echo -n "Linking modules..." |
| 95 |
- @$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS) |
| 96 |
+ @echo n "Linking modules..." |
| 97 |
+ $(CPP) $(LDFLAGS) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS) |
| 98 |
@echo -n " " |
| 99 |
@-$(LS) $(LSFLAGS) $(BIN) |
| 100 |
|
| 101 |
--- Makefile.client.old 2010-10-08 12:37:19.000000000 +0200 |
| 102 |
+++ Makefile.client 2010-10-08 12:37:31.000000000 +0200 |
| 103 |
@@ -1,5 +1,5 @@ |
| 104 |
ALL_SRC_DIRS=client |
| 105 |
all install clean: |
| 106 |
@for subdir in $(ALL_SRC_DIRS); do \ |
| 107 |
- make -C $$subdir -f Makefile $@; \ |
| 108 |
+ $(MAKE) -C $$subdir -f Makefile $@; \ |
| 109 |
done |
Archives