On tisdagen den 8 november 2011, Yaroslav Halchenko wrote:
> if you are a DD -- just proceed with NMU fixing this issue... I have no
> time atm for lush

One NMU coming up, as follows:

diff -Nru lush-1.2.1/debian/changelog lush-1.2.1/debian/changelog
--- lush-1.2.1/debian/changelog 2011-02-27 22:13:03.000000000 +0100
+++ lush-1.2.1/debian/changelog 2011-11-08 22:22:44.000000000 +0100
@@ -1,3 +1,12 @@
+lush (1.2.1-9+cvs20110227+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/05-static-libbfd-needs-lz: Make linking statically
+    against libbfd work by appending -lz, which libbfd needs (Closes:
+    #648014). Thanks to Niels Möller.
+
+ -- Magnus Holmgren <holmg...@debian.org>  Tue, 08 Nov 2011 22:18:13 +0100
+
 lush (1.2.1-9+cvs20110227) unstable; urgency=low
 
   * Upload to unstable
diff -Nru lush-1.2.1/debian/control lush-1.2.1/debian/control
--- lush-1.2.1/debian/control   2011-02-27 22:13:03.000000000 +0100
+++ lush-1.2.1/debian/control   2011-11-08 23:14:15.000000000 +0100
@@ -2,7 +2,7 @@
 Section: devel
 Priority: extra
 Maintainer: Yaroslav Halchenko <deb...@onerussian.com>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, binutils-dev, libxt-dev, 
libxft-dev, gfortran, indent, pkg-config, libncurses-dev, libreadline-dev, 
libgsl0-dev, liblapack-dev, 
libgl1-mesa-dev | libgl-dev, libsdl-dev, libcv-dev, libasound2-dev, 
libaudiofile-dev
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, binutils-dev, libxt-dev, 
libxft-dev, gfortran, indent, pkg-config, libncurses-dev, libreadline-dev, 
libgsl0-dev, liblapack-dev, 
libgl1-mesa-dev | libgl-dev, libsdl-dev, libcv-dev, libasound2-dev, 
libaudiofile-dev, zlib1g-dev
 Standards-Version: 3.9.1
 Homepage: http://lush.sourceforge.net/
 Vcs-Browser: http://git.onerussian.com/?p=deb/lush.git
diff -Nru lush-1.2.1/debian/patches/05-static-libbfd-needs-lz 
lush-1.2.1/debian/patches/05-static-libbfd-needs-lz
--- lush-1.2.1/debian/patches/05-static-libbfd-needs-lz 1970-01-01 
01:00:00.000000000 +0100
+++ lush-1.2.1/debian/patches/05-static-libbfd-needs-lz 2011-11-08 
22:14:30.000000000 +0100
@@ -0,0 +1,26 @@
+From: Niels Möller <ni...@lysator.liu.se>
+Subject: When linking statically against libbfd we need to link against libz 
as well.
+Bug-Debian: http://bugs.debian.org/648014
+
+--- a/configure
++++ b/configure
+@@ -5895,7 +5895,7 @@ else
+ fi
+ 
+     i_LIBS=`echo $n_LIBS | sed -e 's/-liberty/& -lintl/'`
+-    sn_LIBS=`echo $n_LIBS | sed -e 's/-lbfd\( -liberty\)*/-Wl,-Bstatic & 
-Wl,-Bdynamic/'`
++    sn_LIBS=`echo $n_LIBS | sed -e 's/-lbfd\( -liberty\)*/-Wl,-Bstatic & 
-Wl,-Bdynamic -lz/'`
+     si_LIBS=`echo $i_LIBS | sed -e 's/-lbfd\( -liberty\)*/-Wl,-Bstatic & 
-Wl,-Bdynamic/'`
+     LIBS=$sn_LIBS
+     { echo "$as_me:$LINENO: checking whether bfd works with -Bstatic" >&5
+--- a/configure.ac
++++ b/configure.ac
+@@ -151,7 +151,7 @@ if test x$has_bfd = xyes ; then
+     has_intl=
+     AC_CHECK_LIB(intl, dcgettext, [has_intl=yes],[has_intl=no])
+     i_LIBS=`echo $n_LIBS | sed -e 's/-liberty/& -lintl/'`
+-    sn_LIBS=`echo $n_LIBS | sed -e 's/-lbfd\( -liberty\)*/-Wl,-Bstatic & 
-Wl,-Bdynamic/'`
++    sn_LIBS=`echo $n_LIBS | sed -e 's/-lbfd\( -liberty\)*/-Wl,-Bstatic & 
-Wl,-Bdynamic -lz/'`
+     si_LIBS=`echo $i_LIBS | sed -e 's/-lbfd\( -liberty\)*/-Wl,-Bstatic & 
-Wl,-Bdynamic/'`
+     LIBS=$sn_LIBS
+     AC_MSG_CHECKING([whether bfd works with -Bstatic])
diff -Nru lush-1.2.1/debian/patches/series lush-1.2.1/debian/patches/series
--- lush-1.2.1/debian/patches/series    2011-02-27 22:13:03.000000000 +0100
+++ lush-1.2.1/debian/patches/series    2011-11-08 22:17:44.000000000 +0100
@@ -3,3 +3,4 @@
 02-manpage
 03-gcc4-mips
 04-ld-no-add-needed
+05-static-libbfd-needs-lz

-- 
Magnus Holmgren        holmg...@debian.org
Debian Developer 
diff -Nru lush-1.2.1/debian/changelog lush-1.2.1/debian/changelog
--- lush-1.2.1/debian/changelog	2011-02-27 22:13:03.000000000 +0100
+++ lush-1.2.1/debian/changelog	2011-11-08 22:22:44.000000000 +0100
@@ -1,3 +1,12 @@
+lush (1.2.1-9+cvs20110227+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/05-static-libbfd-needs-lz: Make linking statically
+    against libbfd work by appending -lz, which libbfd needs (Closes:
+    #648014). Thanks to Niels Möller.
+
+ -- Magnus Holmgren <holmg...@debian.org>  Tue, 08 Nov 2011 22:18:13 +0100
+
 lush (1.2.1-9+cvs20110227) unstable; urgency=low
 
   * Upload to unstable
diff -Nru lush-1.2.1/debian/control lush-1.2.1/debian/control
--- lush-1.2.1/debian/control	2011-02-27 22:13:03.000000000 +0100
+++ lush-1.2.1/debian/control	2011-11-08 23:14:15.000000000 +0100
@@ -2,7 +2,7 @@
 Section: devel
 Priority: extra
 Maintainer: Yaroslav Halchenko <deb...@onerussian.com>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, binutils-dev, libxt-dev, libxft-dev, gfortran, indent, pkg-config, libncurses-dev, libreadline-dev, libgsl0-dev, liblapack-dev, libgl1-mesa-dev | libgl-dev, libsdl-dev, libcv-dev, libasound2-dev, libaudiofile-dev
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, binutils-dev, libxt-dev, libxft-dev, gfortran, indent, pkg-config, libncurses-dev, libreadline-dev, libgsl0-dev, liblapack-dev, libgl1-mesa-dev | libgl-dev, libsdl-dev, libcv-dev, libasound2-dev, libaudiofile-dev, zlib1g-dev
 Standards-Version: 3.9.1
 Homepage: http://lush.sourceforge.net/
 Vcs-Browser: http://git.onerussian.com/?p=deb/lush.git
diff -Nru lush-1.2.1/debian/patches/05-static-libbfd-needs-lz lush-1.2.1/debian/patches/05-static-libbfd-needs-lz
--- lush-1.2.1/debian/patches/05-static-libbfd-needs-lz	1970-01-01 01:00:00.000000000 +0100
+++ lush-1.2.1/debian/patches/05-static-libbfd-needs-lz	2011-11-08 22:14:30.000000000 +0100
@@ -0,0 +1,26 @@
+From: Niels Möller <ni...@lysator.liu.se>
+Subject: When linking statically against libbfd we need to link against libz as well.
+Bug-Debian: http://bugs.debian.org/648014
+
+--- a/configure
++++ b/configure
+@@ -5895,7 +5895,7 @@ else
+ fi
+ 
+     i_LIBS=`echo $n_LIBS | sed -e 's/-liberty/& -lintl/'`
+-    sn_LIBS=`echo $n_LIBS | sed -e 's/-lbfd\( -liberty\)*/-Wl,-Bstatic & -Wl,-Bdynamic/'`
++    sn_LIBS=`echo $n_LIBS | sed -e 's/-lbfd\( -liberty\)*/-Wl,-Bstatic & -Wl,-Bdynamic -lz/'`
+     si_LIBS=`echo $i_LIBS | sed -e 's/-lbfd\( -liberty\)*/-Wl,-Bstatic & -Wl,-Bdynamic/'`
+     LIBS=$sn_LIBS
+     { echo "$as_me:$LINENO: checking whether bfd works with -Bstatic" >&5
+--- a/configure.ac
++++ b/configure.ac
+@@ -151,7 +151,7 @@ if test x$has_bfd = xyes ; then
+     has_intl=
+     AC_CHECK_LIB(intl, dcgettext, [has_intl=yes],[has_intl=no])
+     i_LIBS=`echo $n_LIBS | sed -e 's/-liberty/& -lintl/'`
+-    sn_LIBS=`echo $n_LIBS | sed -e 's/-lbfd\( -liberty\)*/-Wl,-Bstatic & -Wl,-Bdynamic/'`
++    sn_LIBS=`echo $n_LIBS | sed -e 's/-lbfd\( -liberty\)*/-Wl,-Bstatic & -Wl,-Bdynamic -lz/'`
+     si_LIBS=`echo $i_LIBS | sed -e 's/-lbfd\( -liberty\)*/-Wl,-Bstatic & -Wl,-Bdynamic/'`
+     LIBS=$sn_LIBS
+     AC_MSG_CHECKING([whether bfd works with -Bstatic])
diff -Nru lush-1.2.1/debian/patches/series lush-1.2.1/debian/patches/series
--- lush-1.2.1/debian/patches/series	2011-02-27 22:13:03.000000000 +0100
+++ lush-1.2.1/debian/patches/series	2011-11-08 22:17:44.000000000 +0100
@@ -3,3 +3,4 @@
 02-manpage
 03-gcc4-mips
 04-ld-no-add-needed
+05-static-libbfd-needs-lz

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to