Source: libdap
Version: 3.11.1-9
Severity: serious
Tags: patch sid wheezy
Justification: fails to build from source

Hi there,

libdap FTBFS due to the ltmain --as-needed patch no longer applying.
Excerpt from build log:

,----
| (cd conf && patch < ../debian/as-needed.patch)
| patching file ltmain.sh
| Hunk #1 succeeded at 5512 (offset 12 lines).
| Hunk #2 FAILED at 6155.
| 1 out of 2 hunks FAILED -- saving rejects to file ltmain.sh.rej
| make[1]: *** [override_dh_auto_configure] Error 1
| make[1]: Leaving directory `/«PKGBUILDDIR»'
| make: *** [build] Error 2
| dpkg-buildpackage: error: debian/rules build gave error exit status 2
`----

I made a patch to use dh_autoreconf --as-needed. Attached.

Cheers,

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/dash

-- 
Iain Lane                                  [ i...@orangesquash.org.uk ]
Debian Developer                                   [ la...@debian.org ]
Ubuntu Developer                                   [ la...@ubuntu.com ]
PhD student                                       [ i...@cs.nott.ac.uk ]
diff -Nru libdap-3.11.1/debian/as-needed.patch 
libdap-3.11.1/debian/as-needed.patch
--- libdap-3.11.1/debian/as-needed.patch        2011-09-15 05:18:13.000000000 
+0100
+++ libdap-3.11.1/debian/as-needed.patch        1970-01-01 01:00:00.000000000 
+0100
@@ -1,38 +0,0 @@
-Author: Alastair McKinstry <mckins...@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 -Nru libdap-3.11.1/debian/changelog libdap-3.11.1/debian/changelog
--- libdap-3.11.1/debian/changelog      2011-09-15 05:18:13.000000000 +0100
+++ libdap-3.11.1/debian/changelog      2011-12-07 11:26:44.000000000 +0000
@@ -1,3 +1,11 @@
+libdap (3.11.1-9.1) unstable; urgency=medium
+
+  * Non-maintainer upload with urgency=medium for FTBFS fix.
+  * Switch to dh_autoreconf --as-needed for ltmain-as-needed instead of
+    patching manually.
+
+ -- Iain Lane <la...@debian.org>  Wed, 07 Dec 2011 11:25:56 +0000
+
 libdap (3.11.1-9) unstable; urgency=low
 
   * Rewrite dap-config to call pkg-config, to work correctly with 
diff -Nru libdap-3.11.1/debian/control libdap-3.11.1/debian/control
--- libdap-3.11.1/debian/control        2011-09-15 05:18:13.000000000 +0100
+++ libdap-3.11.1/debian/control        2011-12-07 11:25:54.000000000 +0000
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Alastair McKinstry <mckins...@debian.org>
-Build-Depends: zlib1g-dev, debhelper (>= 7.0.50~), pkg-config, libxml2-dev, 
libcurl4-gnutls-dev , dejagnu, doxygen, graphviz, 
+Build-Depends: zlib1g-dev, debhelper (>= 7.0.50~), dh-autoreconf (>= 4), 
pkg-config, libxml2-dev, libcurl4-gnutls-dev , dejagnu, doxygen, graphviz, 
  autoconf, automake, libtool, flex, bison, uuid-dev
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.9.2
diff -Nru libdap-3.11.1/debian/rules libdap-3.11.1/debian/rules
--- libdap-3.11.1/debian/rules  2011-09-15 05:18:13.000000000 +0100
+++ libdap-3.11.1/debian/rules  2011-12-07 11:51:45.000000000 +0000
@@ -6,16 +6,16 @@
 
 # The magic debhelper rule:
 %:
-       dh $@
+       dh $@ --with autoreconf
 
 
-override_dh_auto_configure:
+override_dh_autoreconf:
        # remove out of date files
        rm -f conf/config.guess conf/config.sub
-       # Patch libtool to fix as-needed brokenness. _After_ updating libtool.
        libtoolize -c -f
-       autoreconf -fi
-       (cd conf && patch < ../debian/as-needed.patch)
+       dh_autoreconf --as-needed
+
+override_dh_auto_configure:
        LDFLAGS=" -Wl,--as-needed" dh_auto_configure -- --with-gnu-ld
 
 override_dh_auto_build:

Attachment: libdap_3.11.1-9-amd64-20111207-1119.gz
Description: Binary data

Reply via email to