[silo-llnl] 46/96: Robust as-needed

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit 5bf67b0440cac0c49d994df105ac2f07be3f1107
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Dec 16 13:52:13 2011 +0000

    Robust as-needed
---
 debian/as-needed.patch | 38 --------------------------------------
 debian/changelog       |  7 +++++++
 debian/control         |  2 +-
 debian/rules           |  9 +++++----
 4 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/debian/as-needed.patch b/debian/as-needed.patch
deleted file mode 100644
index c4748c7..0000000
--- a/debian/as-needed.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Patch to ensure -Wl,--as-needed is NOT reordered by libtool.
- Note that this patch is applied by ./debian/rules AFTER autoreconf is run; 
- it cannot be applied in ./debian/patches
-Bug-Debian: http://bugs.debian.org/347650
-Last-Updated: 2011-09-13
-Forwarded: no
-
---- ltmain.sh.orig	2011-09-13 10:05:45.000000000 +0100
-+++ ltmain.sh 	        2011-09-13 10:22:40.000000000 +0100
-@@ -5500,6 +5500,11 @@
- 	continue
- 	;;
- 
-+      -Wl,--as-needed)
-+        deplibs="$deplibs $arg"
-+        continue
-+        ;;
-+      
-       -export-symbols | -export-symbols-regex)
- 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
- 	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-@@ -6150,6 +6155,15 @@
- 	lib=
- 	found=no
- 	case $deplib in
-+       -Wl,--as-needed)
-+         if test "$linkmode,$pass" = "prog,link"; then
-+           compile_deplibs="$deplib $compile_deplibs"
-+           finalize_deplibs="$deplib $finalize_deplibs"
-+         else
-+           deplibs="$deplib $deplibs"
-+         fi
-+         continue
-+         ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"
diff --git a/debian/changelog b/debian/changelog
index f7295d9..0f4ac99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+silo-llnl (4.8-11) unstable; urgency=low
+
+  * ld-as-needed patch not robust. Use new dh_autoreconf --as-needed
+      method. Closes: #652224
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 16 Dec 2011 13:50:16 +0000
+
 silo-llnl (4.8-10) unstable; urgency=low
 
   * Don't delete config.status, it breaks 'make distclean'
diff --git a/debian/control b/debian/control
index 7b34607..628748a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: silo-llnl
 Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 8.1.3~), libreadline-dev, libhdf5-mpi-dev | libhdf5-dev, zlib1g-dev, libqt4-dev, gfortran, python-dev, chrpath, python-all-dev, mpi-default-dev, autoconf-archive, autoconf, automake, libtool
+Build-Depends: debhelper (>= 8.1.3~), libreadline-dev, libhdf5-mpi-dev | libhdf5-dev, zlib1g-dev, libqt4-dev, gfortran, python-dev, chrpath, python-all-dev, mpi-default-dev, autoconf-archive, autoconf, automake, libtool, dh-autoreconf (>= 4~)
 Build-Conflicts: qt3-dev-tools
 Standards-Version: 3.9.2
 Homepage:  https://wci.llnl.gov/codes/silo
diff --git a/debian/rules b/debian/rules
index 712c523..c290912 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 
 # magic debhelper rule
 %:
-	dh $@ --with python2 
+	dh $@ --with python2,autoreconf
 
 include /usr/share/mpi-default-dev/debian_defaults
 #ARCH_DEFAULT_MPI_IMPL=lam
@@ -20,10 +20,11 @@ endif
 PYVERS:= `pyversions -s`
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+override_dh_autoreconf:
+	libtoolize -c -f
+	dh_autoreconf --as-needed
+
 override_dh_auto_configure:
-	# Fix as-needed for libtool.
-	autoreconf -fiv
-	(cd config && patch < ../debian/as-needed.patch)
 	LDFLAGS=" -Wl,--as-needed" dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib  --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I$(MPI_INC)"  CC=$(CC) 
 
 override_dh_auto_build:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git