Bug#761732: apr: libtool split: package needs a b-d on libtool-bin (or avoid using the libtool binary)

2014-09-19 Thread Helmut Grohne
Control: tags -1 + patch

Dear apr maintainer,

On Mon, Sep 15, 2014 at 11:41:19PM +, Matthias Klose wrote:
 ./buildconf
 buildconf: checking installation...
 buildconf: python version 2.7.8 (ok)
 buildconf: autoconf version 2.69 (ok)
 buildconf: libtool not found.
You need libtool version 1.4 or newer installed
to build APR from SVN.
 make[1]: *** [override_dh_auto_configure] Error 1
 debian/rules:76: recipe for target 'override_dh_auto_configure' failed
 make[1]: Leaving directory '/«PKGBUILDDIR»'
 make: *** [binary] Error 2
 debian/rules:18: recipe for target 'binary' failed
 dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 
 2

apr only uses libtoolize but checks for libtool which is now in package
libtool-bin. I am attaching a patch that fixes the libtoolize check to
look for the correct tool. Please speak up, if you do not want your
package to get NMUed.

Helmut
diff -Nru apr-1.5.1/debian/changelog apr-1.5.1/debian/changelog
--- apr-1.5.1/debian/changelog  2014-05-12 23:21:06.0 +0200
+++ apr-1.5.1/debian/changelog  2014-09-19 12:34:28.0 +0200
@@ -1,3 +1,10 @@
+apr (1.5.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Check for libtoolize rather than libtool. Closes: #761732
+
+ -- Helmut Grohne hel...@subdivi.de  Fri, 19 Sep 2014 12:34:05 +0200
+
 apr (1.5.1-2) unstable; urgency=medium
 
   * Backport build fix from upstream SVN to avoid building some parts
diff -Nru apr-1.5.1/debian/patches/libtoolize_check.patch 
apr-1.5.1/debian/patches/libtoolize_check.patch
--- apr-1.5.1/debian/patches/libtoolize_check.patch 1970-01-01 
01:00:00.0 +0100
+++ apr-1.5.1/debian/patches/libtoolize_check.patch 2014-09-19 
12:34:00.0 +0200
@@ -0,0 +1,26 @@
+From: Helmut Grohne hel...@subdivi.de
+Subject: check for libtoolize rather than libtool
+Last-Update: 2014-09-19
+
+libtool is now in package libtool-bin, but apr only needs libtoolize.
+
+Index: apr-1.5.1/build/buildcheck.sh
+===
+--- apr-1.5.1.orig/build/buildcheck.sh 2009-11-13 01:27:16.0 +0100
 apr-1.5.1/build/buildcheck.sh  2014-09-19 12:33:14.0 +0200
+@@ -37,11 +37,11 @@
+ # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
+ # output is multiline from 1.5 onwards
+ 
+-# Require libtool 1.4 or newer
+-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
+-lt_pversion=`$libtool --version 2/dev/null|sed -e 
's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
++# Require libtoolize 1.4 or newer
++libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 
libtoolize14`
++lt_pversion=`$libtoolize --version 2/dev/null|sed -e 
's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
+ if test -z $lt_pversion; then
+-echo buildconf: libtool not found.
++echo buildconf: libtoolize not found.
+ echoYou need libtool version 1.4 or newer installed
+ echoto build APR from SVN.
+ exit 1
diff -Nru apr-1.5.1/debian/patches/series apr-1.5.1/debian/patches/series
--- apr-1.5.1/debian/patches/series 2014-05-12 23:14:11.0 +0200
+++ apr-1.5.1/debian/patches/series 2014-09-19 12:31:35.0 +0200
@@ -7,3 +7,4 @@
 hurd_shm_flock.patch
 dont_override_external_buildflags
 buildfix_r1589984
+libtoolize_check.patch


Bug#761732: apr: libtool split: package needs a b-d on libtool-bin (or avoid using the libtool binary)

2014-09-15 Thread Matthias Klose
Package: src:apr
Version: 1.5.1-2
Severity: wishlist
User: debian-cr...@lists.debian.org
Usertags: libtool-split

As part of the effort to cross-build the archive, the libtool package
needs a split into an architecture independent part and an
architecture dpendent part (the latter only consisting of the libtool
binary).  The split is already done for jessie/sid, but to enable the
cross buildability, the dependency in libtool on libtool-bin needs to
be removed, and libtool-bin needs to depend on libtool instead.

The vast majority of packages using libtool via automake don't need
the libtool binary, and thus no changes in the build dependencies, however
about 60 source packages are using libtool directly, and need changes.

 - some packages just check for the libtool binary, and then don't
   use it for the build (but are using libtoolize instead).  Such
   usages are seen in a script called buildcheck.sh, and sometimes
   in autogen.sh scripts.  The solution for these cases is to patch
   these scripts to check for libtoolize instead of libtool, and
   not to introduce the new build dependency.

 - other packages just need the additional build dependency on
   libtool-bin.

To test your packages with the libtool-bin package removed, please use
the binaries found at

  deb https://people.debian.org/~doko/tmp/20140820 ./

It is not clear, if all of these changes can be done in time for
the jessie release, but it would be nice to have to be able to
cross-build more packages in jessie.

For questions and help please email the debian-cross ML.

For additional pointers please see
https://lists.debian.org/debian-devel-announce/2014/08/msg00013.html
and some discussion in the orignal issue filed for libtool (#682045).

The full build log can be found at:
http://people.debian.org/~doko/logs/20140912/failed-libtool/apr_1.5.1-2_unstable_jdk-libtool.log
The last lines of the build log are at the end of this report.

[...]

dpkg-buildpackage: source package apr
dpkg-buildpackage: source version 1.5.1-2
dpkg-buildpackage: source distribution unstable
dpkg-buildpackage: source changed by Stefan Fritsch s...@debian.org
 dpkg-source --before-build apr-1.5.1
dpkg-buildpackage: host architecture amd64
 fakeroot debian/rules clean
dh clean -Bdebian/build --parallel --with autotools_dev
   dh_testdir -O-Bdebian/build -O--parallel
   debian/rules override_dh_auto_clean
make[1]: Entering directory '/«PKGBUILDDIR»'
dh_auto_clean
rm -rf debian/build
for f in configure build/libtool.m4 build/ltmain.sh ; do [ ! -e $f.dr-orig ] || 
mv $f.dr-orig $f ; done
make[1]: Leaving directory '/«PKGBUILDDIR»'
   dh_autotools-dev_restoreconfig -O-Bdebian/build -O--parallel
   dh_clean -O-Bdebian/build -O--parallel
 dpkg-source -b apr-1.5.1
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building apr using existing ./apr_1.5.1.orig.tar.bz2
dpkg-source: info: building apr in apr_1.5.1-2.debian.tar.xz
dpkg-source: info: building apr in apr_1.5.1-2.dsc
 debian/rules build
make: Nothing to be done for 'build'.
 fakeroot debian/rules binary
dh binary -Bdebian/build --parallel --with autotools_dev
   debian/rules build
make[1]: Entering directory '/«PKGBUILDDIR»'
make[1]: Nothing to be done for 'build'.
make[1]: Leaving directory '/«PKGBUILDDIR»'
   dh_testdir -O-Bdebian/build -O--parallel
   dh_autotools-dev_updateconfig -O-Bdebian/build -O--parallel
   debian/rules override_dh_auto_configure
make[1]: Entering directory '/«PKGBUILDDIR»'
mkdir -p debian/build/docs
for f in configure build/libtool.m4 build/ltmain.sh ; do [ -e $f.dr-orig ] || 
cp -p $f $f.dr-orig ; done
./buildconf
buildconf: checking installation...
buildconf: python version 2.7.8 (ok)
buildconf: autoconf version 2.69 (ok)
buildconf: libtool not found.
   You need libtool version 1.4 or newer installed
   to build APR from SVN.
make[1]: *** [override_dh_auto_configure] Error 1
debian/rules:76: recipe for target 'override_dh_auto_configure' failed
make[1]: Leaving directory '/«PKGBUILDDIR»'
make: *** [binary] Error 2
debian/rules:18: recipe for target 'binary' failed
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2


-- 
To UNSUBSCRIBE, email to debian-apache-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xtftx-00017e...@paradis.debian.org