[pkg-nvidia-devel] r1023 - in /packages/nvclock/trunk/debian: changelog patches/link-with-all-libs.diff patches/series

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Sun Jun  6 09:08:52 2010
New Revision: 1023

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1023
Log:
add patch link-with-all-libs.diff to fix FTBFS with binutils-gold (Closes: #555781)

Added:
    packages/nvclock/trunk/debian/patches/link-with-all-libs.diff
Modified:
    packages/nvclock/trunk/debian/changelog
    packages/nvclock/trunk/debian/patches/series

Modified: packages/nvclock/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/debian/changelog?rev=1023&op=diff
==============================================================================
--- packages/nvclock/trunk/debian/changelog (original)
+++ packages/nvclock/trunk/debian/changelog Sun Jun  6 09:08:52 2010
@@ -21,7 +21,10 @@
   * Switch to source format 3.0 (quilt).
   * Update to upstream CVS as of 2009-06-22.  (Closes: #463890)
   * Rerun autogen.sh since we patch configure.in.
-  * Add patch from Barry deFreese to fix FTBFS on GNU/Hurd.  (Closes: #533918)
+  * Add patch nvclock_hurd.debdiff from Barry deFreese to fix FTBFS on
+    GNU/Hurd.  (Closes: #533918)
+  * Add patch link-with-all-libs.diff to fix FTBFS with binutils-gold.
+    (Closes: #555781)
 
  -- Andreas Beckmann <debian at abeckmann.de>  Sat, 05 Jun 2010 13:32:18 +0200
 

Added: packages/nvclock/trunk/debian/patches/link-with-all-libs.diff
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/debian/patches/link-with-all-libs.diff?rev=1023&op=file
==============================================================================
--- packages/nvclock/trunk/debian/patches/link-with-all-libs.diff (added)
+++ packages/nvclock/trunk/debian/patches/link-with-all-libs.diff Sun Jun  6 09:08:52 2010
@@ -1,0 +1,41 @@
+From: Andreas Beckmann <debian at abeckmann.de>
+Subject: Fix FTBFS with binutils-gold
+ Because --no-add-needed is the default with gold, all libraries need to be
+ specified at link time.
+Bug-Debian: http://bugs.debian.org/555781
+
+Index: b/src/gtk/Makefile.in
+===================================================================
+--- a/src/gtk/Makefile.in	2010-06-05 16:39:26.940537776 +0200
++++ b/src/gtk/Makefile.in	2010-06-05 16:40:11.404537713 +0200
+@@ -20,11 +20,11 @@
+ 
+ ifeq ($(HAVE_NVCONTROL), yes)
+     DEPS=$(libbackend) $(libnvcontrol)
+-    LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
++    LIBS=-Wl,--as-needed @X11_LIBS@ @GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol -ldl
+     OBJECTS=banner.o gl.o hw.o main.o settings.o
+ else
+     DEPS=$(libbackend)
+-    LIBS=@GTK_LIBS@ -L../backend -lbackend
++    LIBS=-Wl,--as-needed @X11_LIBS@ @GTK_LIBS@ -L../backend -lbackend -ldl
+     OBJECTS=banner.o hw.o main.o settings.o
+ endif
+ 
+Index: b/src/qt/Makefile.in
+===================================================================
+--- a/src/qt/Makefile.in	2010-06-05 16:40:16.296536570 +0200
++++ b/src/qt/Makefile.in	2010-06-05 16:41:12.140537643 +0200
+@@ -21,10 +21,10 @@
+ 
+ ifeq ($(HAVE_NVCONTROL), yes)
+     DEPS=$(libbackend) $(libnvcontrol)
+-    LIBS=@QT_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
++    LIBS=@X11_LIBS@ @QT_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
+ else
+     DEPS=$(libbackend)
+-    LIBS=@QT_LIBS@ -L../backend -lbackend
++    LIBS=@X11_LIBS@ @QT_LIBS@ -L../backend -lbackend
+ endif
+ 
+ .PHONY: clean distclean install

Modified: packages/nvclock/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/debian/patches/series?rev=1023&op=diff
==============================================================================
--- packages/nvclock/trunk/debian/patches/series (original)
+++ packages/nvclock/trunk/debian/patches/series Sun Jun  6 09:08:52 2010
@@ -1,2 +1,3 @@
 cvs-2009-06-22.diff
 nvclock_hurd.debdiff
+link-with-all-libs.diff