Author: helmut-guest
Date: 2011-11-03 18:47:03 +0000 (Thu, 03 Nov 2011)
New Revision: 12780
Added:
packages/trunk/jugglemaster/debian/patches/ld-as-needed.patch
Modified:
packages/trunk/jugglemaster/debian/changelog
packages/trunk/jugglemaster/debian/patches/series
Log:
Fix "FTBFS with ld --as-needed" applied patch from Ilya Barygin (Closes:
#631700)
Modified: packages/trunk/jugglemaster/debian/changelog
===================================================================
--- packages/trunk/jugglemaster/debian/changelog 2011-11-03 18:35:58 UTC
(rev 12779)
+++ packages/trunk/jugglemaster/debian/changelog 2011-11-03 18:47:03 UTC
(rev 12780)
@@ -7,8 +7,10 @@
Olly Betts (Closes: #645409)
* Fix "Error in patch 010_wx26_trans.patch" applied and tested patch from
Olly Betts (Closes: #645409)
+ * Fix "FTBFS with ld --as-needed" applied patch from Ilya Barygin
+ (Closes: #631700)
- -- Helmut Grohne <[email protected]> Thu, 03 Nov 2011 19:34:38 +0100
+ -- Helmut Grohne <[email protected]> Thu, 03 Nov 2011 19:42:20 +0100
jugglemaster (0.4-5) unstable; urgency=low
Added: packages/trunk/jugglemaster/debian/patches/ld-as-needed.patch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/ld-as-needed.patch
(rev 0)
+++ packages/trunk/jugglemaster/debian/patches/ld-as-needed.patch
2011-11-03 18:47:03 UTC (rev 12780)
@@ -0,0 +1,25 @@
+Description: Fix order of parameters passed to ld. Fixes FTBFS when linking
+ with --as-needed.
+Author: Ilya Barygin <[email protected]>
+Bug-Ubuntu: https://launchpad.net/bugs/770910
+Bug-Debian: http://bugs.debian.org/631700
+--- jugglemaster-0.4.orig/src/aajm/Makefile
++++ jugglemaster-0.4/src/aajm/Makefile
+@@ -1,7 +1,7 @@
+ include ../../Makefile.cfg
+
+ CXXFLAGS+=-Wall -pedantic -fsigned-char `aalib-config --cflags`
+-LDFLAGS+=`aalib-config --libs`
++LIBS+=`aalib-config --libs`
+ BINARY=aajm
+ INSTALL=install
+
+@@ -14,7 +14,7 @@ OBJ=aa_drawcircle.o aa_drawline.o aajm.o
+ all: aajm aajm-remote
+
+ aajm: jm_lib $(OBJ)
+- $(CXX) $(LDFLAGS) -o $(BINARY) $(OBJ) ../jmlib/jmlib.a
++ $(CXX) $(LDFLAGS) -o $(BINARY) $(OBJ) ../jmlib/jmlib.a $(LIBS)
+
+ jm_lib:
+ $(MAKE) -C ../jmlib
Modified: packages/trunk/jugglemaster/debian/patches/series
===================================================================
--- packages/trunk/jugglemaster/debian/patches/series 2011-11-03 18:35:58 UTC
(rev 12779)
+++ packages/trunk/jugglemaster/debian/patches/series 2011-11-03 18:47:03 UTC
(rev 12780)
@@ -8,3 +8,4 @@
fix-style-rendering.patch
fix-memory-zeroing.patch
wx28-compatibility.patch
+ld-as-needed.patch
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
