| 1 |
tupone 10/09/08 12:20:36 |
| 2 |
|
| 3 |
Modified: freecnc-0.2.1.31072003-as-needed.patch |
| 4 |
0.2.1.31072003-makefile-cflags.patch |
| 5 |
Log: |
| 6 |
Respect LDFLAGS. Bug #336299 |
| 7 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 games-strategy/freecnc/files/freecnc-0.2.1.31072003-as-needed.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freecnc/files/freecnc-0.2.1.31072003-as-needed.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freecnc/files/freecnc-0.2.1.31072003-as-needed.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freecnc/files/freecnc-0.2.1.31072003-as-needed.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: freecnc-0.2.1.31072003-as-needed.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/games-strategy/freecnc/files/freecnc-0.2.1.31072003-as-needed.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- freecnc-0.2.1.31072003-as-needed.patch 7 Dec 2009 18:57:00 -0000 1.1 |
| 23 |
+++ freecnc-0.2.1.31072003-as-needed.patch 8 Sep 2010 12:20:36 -0000 1.2 |
| 24 |
@@ -1,5 +1,5 @@ |
| 25 |
---- freecnc++.org/tools/tmpinied/Makefile 2009-12-07 18:18:23.985443151 +0000 |
| 26 |
-+++ freecnc++/tools/tmpinied/Makefile 2009-12-07 18:19:45.869476911 +0000 |
| 27 |
+--- tools/tmpinied/Makefile 2009-12-07 18:18:23.985443151 +0000 |
| 28 |
++++ tools/tmpinied/Makefile 2009-12-07 18:19:45.869476911 +0000 |
| 29 |
@@ -13,7 +13,7 @@ |
| 30 |
CFLAGS = -g -Wall -Werror -I../../src/include `sdl-config --cflags` |
| 31 |
|
| 32 |
@@ -9,3 +9,36 @@ |
| 33 |
clean: |
| 34 |
\rm -f $(LOCALOBJS) ../../tmpinied |
| 35 |
|
| 36 |
+--- tools/audplay/Makefile.old 2010-09-08 10:26:48.000000000 +0200 |
| 37 |
++++ tools/audplay/Makefile 2010-09-08 10:27:19.000000000 +0200 |
| 38 |
+@@ -12,7 +12,7 @@ |
| 39 |
+ CFLAGS = -g -Wall -I. -I../../src/include `sdl-config --cflags` $(EXTRACFLAGS) |
| 40 |
+ |
| 41 |
+ ../../audplay: $(LOCALOBJS) $(OBJECTS) |
| 42 |
+- $(CXX) -o ../../audplay -g $(LOCALOBJS) $(OBJECTS) `sdl-config --libs` $(LIBS) $(LDFLAGS) |
| 43 |
++ $(CXX) -o ../../audplay -g $(LDFLAGS) $(LOCALOBJS) $(OBJECTS) `sdl-config --libs` $(LIBS) |
| 44 |
+ clean: |
| 45 |
+ \rm -f $(LOCALOBJS) ../../audplay |
| 46 |
+ |
| 47 |
+--- tools/mixshell/Makefile.old 2010-09-08 10:28:25.000000000 +0200 |
| 48 |
++++ tools/mixshell/Makefile 2010-09-08 10:28:53.000000000 +0200 |
| 49 |
+@@ -6,7 +6,7 @@ |
| 50 |
+ CFLAGS = -g -Wall -I. -I../../src/include `sdl-config --cflags` $(EXTRACFLAGS) |
| 51 |
+ |
| 52 |
+ mixshell: $(LOCALOBJ) $(OBJ) |
| 53 |
+- $(CXX) -o mixshell $(LOCALOBJ) $(OBJ) `sdl-config --libs` $(LIBS) $(LDFLAGS) |
| 54 |
++ $(CXX) -o mixshell $(LDFLAGS) $(LOCALOBJ) $(OBJ) `sdl-config --libs` $(LIBS) |
| 55 |
+ |
| 56 |
+ clean: |
| 57 |
+ \rm -rf $(LOCALOBJ) mixshell |
| 58 |
+--- tools/shpview/Makefile.old 2010-09-08 10:30:15.000000000 +0200 |
| 59 |
++++ tools/shpview/Makefile 2010-09-08 10:30:28.000000000 +0200 |
| 60 |
+@@ -13,7 +13,7 @@ |
| 61 |
+ CFLAGS = -g -Wall -I. -I../../src/include `sdl-config --cflags` $(EXTRACFLAGS) |
| 62 |
+ |
| 63 |
+ ../../shpview: $(LOCALOBJS) $(OBJECTS) |
| 64 |
+- $(CXX) -o ../../shpview -g $(LDFLAGS) $(LOCALOBJS) $(OBJECTS) `sdl-config --libs` $(LIBS) $(LDFLAGS) |
| 65 |
++ $(CXX) -o ../../shpview -g $(LDFLAGS) $(LOCALOBJS) $(OBJECTS) `sdl-config --libs` $(LIBS) |
| 66 |
+ clean: |
| 67 |
+ \rm -f $(LOCALOBJS) ../../shpview |
| 68 |
+ |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.2 games-strategy/freecnc/files/0.2.1.31072003-makefile-cflags.patch |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freecnc/files/0.2.1.31072003-makefile-cflags.patch?rev=1.2&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freecnc/files/0.2.1.31072003-makefile-cflags.patch?rev=1.2&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freecnc/files/0.2.1.31072003-makefile-cflags.patch?r1=1.1&r2=1.2 |
| 77 |
|
| 78 |
Index: 0.2.1.31072003-makefile-cflags.patch |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/games-strategy/freecnc/files/0.2.1.31072003-makefile-cflags.patch,v |
| 81 |
retrieving revision 1.1 |
| 82 |
retrieving revision 1.2 |
| 83 |
diff -u -r1.1 -r1.2 |
| 84 |
--- 0.2.1.31072003-makefile-cflags.patch 10 Sep 2003 05:27:31 -0000 1.1 |
| 85 |
+++ 0.2.1.31072003-makefile-cflags.patch 8 Sep 2010 12:20:36 -0000 1.2 |
| 86 |
@@ -8,9 +8,10 @@ |
| 87 |
"LIBS = -lSDL_net" |
| 88 |
+ $(MAKE) -j2 -C src plugins \ |
| 89 |
- "EXTRACFLAGS = -ansi -pedantic -fPIC -Werror" \ |
| 90 |
- "LDFLAGS = -shared" |
| 91 |
+- "LDFLAGS = -shared" |
| 92 |
- + $(MAKE) -j2 -C tools \ |
| 93 |
- "EXTRACFLAGS = -ansi -pedantic" |
| 94 |
++ "LDFLAGS = ${LDFLAGS} -shared" |
| 95 |
+ + $(MAKE) -j2 -C tools |
| 96 |
|
| 97 |
linux-nonet: |
Archives