r9646 - in packages/trunk/desmume/debian: . patches

[Evgeni Golov]

Author: evgeni
Date: 2009-04-26 06:46:22 +0000 (Sun, 26 Apr 2009)
New Revision: 9646

Added:
   packages/trunk/desmume/debian/patches/01_link-with-GL.patch
Modified:
   packages/trunk/desmume/debian/changelog
   packages/trunk/desmume/debian/patches/series
   packages/trunk/desmume/debian/rules
Log:
Add 01_link-with-GL.patch
Add patch (ACKed by upstream) to link against libGL, so we don't
FTBFS when using --as-needed.

And thus enable linking with --as-needed again.


Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog	2009-04-25 19:44:29 UTC (rev 9645)
+++ packages/trunk/desmume/debian/changelog	2009-04-26 06:46:22 UTC (rev 9646)
@@ -8,11 +8,13 @@
       upstream says this is the safer way to go.
   * debian/patches/01_gfx3d.h_64bit_fix.patch:
     + Drop the patch, it's included in this release.
+  * debian/patches/01_link-with-GL.patch:
+    + Add patch (ACKed by upstream) to link against libGL, so we don't
+      FTBFS when using --as-needed.
   * debian/rules:
     + Build with --enable-osmesa.
-    + Don't link with -Wl,--as-needed for now.
 
- -- Evgeni Golov <evgeni at debian.org>  Sat, 25 Apr 2009 21:35:07 +0200
+ -- Evgeni Golov <evgeni at debian.org>  Sun, 26 Apr 2009 08:43:24 +0200
 
 desmume (0.9.2-1) unstable; urgency=low
 

Added: packages/trunk/desmume/debian/patches/01_link-with-GL.patch
===================================================================
--- packages/trunk/desmume/debian/patches/01_link-with-GL.patch	                        (rev 0)
+++ packages/trunk/desmume/debian/patches/01_link-with-GL.patch	2009-04-26 06:46:22 UTC (rev 9646)
@@ -0,0 +1,36 @@
+From: Evgeni Golov <evgeni at debian.org>
+Date: 2009-04-26 08:29:37 +0200
+Subject: Link with -lGL so it does not FTBFS with --as-needed
+License: 3-BSD
+
+--- desmume-0.9.2-1/configure	2009-04-24 21:39:30.000000000 +0200
++++ desmume-0.9.2-1.patched/configure	2009-04-26 08:29:37.000000000 +0200
+@@ -6686,7 +6686,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lOSMesa  $LIBS"
++LIBS="-lOSMesa -lGL $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -6746,7 +6746,7 @@
+ #define HAVE_LIBOSMESA 1
+ _ACEOF
+ 
+-		LIBS="-lOSMesa $LIBS"
++		LIBS="-lOSMesa -lGL $LIBS"
+ 
+ fi
+ 
+--- desmume-0.9.2-1/configure.ac	2009-04-24 21:38:35.000000000 +0200
++++ desmume-0.9.2-1.patched/configure.ac	2009-04-26 08:28:16.000000000 +0200
+@@ -63,7 +63,7 @@
+ 	AC_CHECK_LIB(OSMesa, main,[
+ 		useosmesa=yes
+ 		AC_DEFINE(HAVE_LIBOSMESA)
+-		LIBS="-lOSMesa $LIBS"
++		LIBS="-lOSMesa -lGL $LIBS"
+ 	])
+ fi
+ 

Modified: packages/trunk/desmume/debian/patches/series
===================================================================
--- packages/trunk/desmume/debian/patches/series	2009-04-25 19:44:29 UTC (rev 9645)
+++ packages/trunk/desmume/debian/patches/series	2009-04-26 06:46:22 UTC (rev 9646)
@@ -1 +1 @@
-#
+01_link-with-GL.patch

Modified: packages/trunk/desmume/debian/rules
===================================================================
--- packages/trunk/desmume/debian/rules	2009-04-25 19:44:29 UTC (rev 9645)
+++ packages/trunk/desmume/debian/rules	2009-04-26 06:46:22 UTC (rev 9646)
@@ -33,8 +33,7 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 	./configure $(configure_flags) \
-		CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-				# "-Wl,--as-needed"
+		CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
 
 build: $(QUILT_STAMPFN) build-stamp