Hi,
I could now finally reproduce and solve the build failure caused by my
patch and non-gold binutils.
There are two patches attached to this mail:
The first fixes the build failure in the git repository.
The second is the extended NMU patch - just for completeness.
Best regards,
Johann Felix Soden
>From f18872409a83d629f6b0fae65aaf216a4269fc34 Mon Sep 17 00:00:00 2001
From: Johann Felix Soden <joh...@gmx.de>
Date: Sun, 1 Jan 2012 21:40:19 +0100
Subject: [PATCH] Fix build failure with binutils non-gold.
---
debian/rules | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/debian/rules b/debian/rules
index c7a6c26..ff2d9cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,3 +9,7 @@ override_dh_auto_clean:
override_dh_auto_configure:
./configure --prefix=/usr
+ $(MAKE) qmake
+ cd src && $(MAKE) qmake
+ # append a second -lX11 option to end of LIBS
+ sed -e 's/^\(LIBS\s*=.*[^1]\)$$/\1 -lX11/' -i src/ui/Makefile
--
1.7.7.3
diff -Nru esperanza-0.4.0+git20091017/debian/changelog esperanza-0.4.0+git20091017/debian/changelog
--- esperanza-0.4.0+git20091017/debian/changelog 2010-02-28 18:41:26.000000000 +0100
+++ esperanza-0.4.0+git20091017/debian/changelog 2012-01-01 22:27:24.000000000 +0100
@@ -1,3 +1,10 @@
+esperanza (0.4.0+git20091017-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with and without binutils-gold (Closes: #554330, #653814).
+
+ -- Johann Felix Soden <joh...@gmx.de> Sun, 01 Jan 2012 22:25:23 +0100
+
esperanza (0.4.0+git20091017-1) unstable; urgency=low
* New upstream snapshot.
diff -Nru esperanza-0.4.0+git20091017/debian/control esperanza-0.4.0+git20091017/debian/control
--- esperanza-0.4.0+git20091017/debian/control 2010-02-28 01:08:05.000000000 +0100
+++ esperanza-0.4.0+git20091017/debian/control 2012-01-01 22:29:53.000000000 +0100
@@ -7,6 +7,7 @@
Build-Depends: cdbs,
debhelper (>= 7),
libboost-dev,
+ libboost-signals-dev,
libqt4-dev,
libxmmsclient++-dev (>= 0.7DrNo),
libx11-dev
diff -Nru esperanza-0.4.0+git20091017/debian/patches/binutils-gold.patch esperanza-0.4.0+git20091017/debian/patches/binutils-gold.patch
--- esperanza-0.4.0+git20091017/debian/patches/binutils-gold.patch 1970-01-01 01:00:00.000000000 +0100
+++ esperanza-0.4.0+git20091017/debian/patches/binutils-gold.patch 2012-01-01 22:22:08.000000000 +0100
@@ -0,0 +1,14 @@
+Description: Fix FTBFS with binutils-gold
+Author: Johann Felix Soden joh...@gmx.de>
+Bug-Debian: http://bugs.debian.org/554330
+--- a/config.pri
++++ b/config.pri
+@@ -12,6 +12,8 @@
+
+ !win32 {
+ include (conf.pri)
++ QMAKE_LFLAGS += -Wl,--as-needed
++ LIBS += -lboost_signals -lX11
+ }
+
+ win32 {
diff -Nru esperanza-0.4.0+git20091017/debian/patches/series esperanza-0.4.0+git20091017/debian/patches/series
--- esperanza-0.4.0+git20091017/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ esperanza-0.4.0+git20091017/debian/patches/series 2012-01-01 22:22:08.000000000 +0100
@@ -0,0 +1 @@
+binutils-gold.patch
diff -Nru esperanza-0.4.0+git20091017/debian/rules esperanza-0.4.0+git20091017/debian/rules
--- esperanza-0.4.0+git20091017/debian/rules 2010-02-28 18:37:05.000000000 +0100
+++ esperanza-0.4.0+git20091017/debian/rules 2012-01-01 22:25:00.000000000 +0100
@@ -6,5 +6,11 @@
DEB_CONFIGURE_NORMAL_ARGS = --prefix=/usr --bindir=/usr/bin
DEB_MAKE_INSTALL_TARGET = install INSTALL_ROOT=$(DEB_DESTDIR)
+configure/esperanza::
+ $(MAKE) qmake
+ cd src && $(MAKE) qmake
+ # append a second -lX11 option to end of LIBS
+ sed -e 's/^\(LIBS\s*=.*[^1]\)$$/\1 -lX11/' -i src/ui/Makefile
+
clean::
rm -f conf.log conf.pri esperanza
