Package: src:util-linux
Version: 2.25.1-3
Severity: important
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
User: debian-cr...@lists.debian.org
Usertags: libtool-split
Control: block 682045 by -1

Hi Andreas,

util-linxu will FTBFS when libtool drops its Depends on libtool-bin.
See #682045 for details. At that time, a Build-Depends: libtool will no
longer mean that /usr/bin/libtool is available. Fortunately, the only
place that util-linux uses /usr/bin/libtool is in autogen.sh for
checking whether libtool is installed. After that it uses libtoolize
only (in the way libtool is intended to be used). So all that needs to
change is that autogen.sh needs to check for libtoolize rather than
libtool. And this is where my patch comes in.

Helmut
diff -Nru util-linux-2.25.1/debian/changelog util-linux-2.25.1/debian/changelog
--- util-linux-2.25.1/debian/changelog  2014-10-05 19:06:55.000000000 +0200
+++ util-linux-2.25.1/debian/changelog  2014-10-07 18:36:56.000000000 +0200
@@ -1,3 +1,10 @@
+util-linux (2.25.1-3.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Check for libtoolize rather than libtool. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Tue, 07 Oct 2014 18:34:23 +0200
+
 util-linux (2.25.1-3) unstable; urgency=medium
 
   [ Ben Hutchings ]
diff -Nru 
util-linux-2.25.1/debian/patches/check-for-libtoolize-rather-than-libtool.patch 
util-linux-2.25.1/debian/patches/check-for-libtoolize-rather-than-libtool.patch
--- 
util-linux-2.25.1/debian/patches/check-for-libtoolize-rather-than-libtool.patch 
    1970-01-01 01:00:00.000000000 +0100
+++ 
util-linux-2.25.1/debian/patches/check-for-libtoolize-rather-than-libtool.patch 
    2014-10-07 18:36:24.000000000 +0200
@@ -0,0 +1,20 @@
+From: Helmut Grohne <hel...@subdivi.de>
+Subject: check for libtoolize rather than libtool
+Last-Update: 2014-10-07
+
+libtool lives in libtool-bin, but util-linux does not Build-Depend on
+libtool-bin (because it doesn't need it).
+
+Index: util-linux-2.25.1/autogen.sh
+===================================================================
+--- util-linux-2.25.1.orig/autogen.sh
++++ util-linux-2.25.1/autogen.sh
+@@ -66,7 +66,7 @@
+       echo
+       DIE=1
+ }
+-(libtool --version) < /dev/null > /dev/null 2>&1 || {
++(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
+       echo
+       echo "You must have libtool-2 installed to generate util-linux build 
system."
+       echo
diff -Nru util-linux-2.25.1/debian/patches/series 
util-linux-2.25.1/debian/patches/series
--- util-linux-2.25.1/debian/patches/series     2014-10-05 19:06:55.000000000 
+0200
+++ util-linux-2.25.1/debian/patches/series     2014-10-07 18:34:50.000000000 
+0200
@@ -11,3 +11,4 @@
 libmount-only-include-context-on-linux.patch
 build-sys-build-libmount-everywhere.patch
 build-sys-use-lutil-for-BSD-only.patch
+check-for-libtoolize-rather-than-libtool.patch

Reply via email to