Package: libtool
Version: 2.4-4
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
Hi Kurt,
In Ubuntu, the attached patch was applied to make libltdl compatible with
multiarch, as described at
<http://wiki.debian.org/Multiarch/Implementation>.
This library is a priority for conversion because it has a number of reverse
dependencies that need to be used in a multiarch configuration, including
unixodbc and libgphoto2.
Thanks for considering the patch.
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru libtool-2.4/debian/control libtool-2.4/debian/control
--- libtool-2.4/debian/control 2011-10-11 06:50:14.000000000 -0700
+++ libtool-2.4/debian/control 2011-10-25 17:36:15.000000000 -0700
@@ -1,5 +1,5 @@
Source: libtool
-Build-Depends: debhelper (>= 7.0), texi2html, texinfo, file, gfortran | fortran95-compiler, automake (>= 1:1.11.1), autoconf (>= 2.62), autotools-dev, zlib1g-dev
+Build-Depends: debhelper (>= 8.1.3~), texi2html, texinfo, file, gfortran | fortran95-compiler, automake (>= 1:1.11.1), autoconf (>= 2.62), autotools-dev, zlib1g-dev
Build-Conflicts: automake1.9, gcj
Section: devel
Priority: optional
@@ -42,7 +42,9 @@
Package: libltdl7
Architecture: any
+Multi-Arch: same
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}
Description: A system independent dlopen wrapper for GNU libtool
This package contains the run-time libltdl library.
@@ -61,6 +63,7 @@
Package: libltdl-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Suggests: libtool-doc
Recommends: libtool
diff -Nru libtool-2.4/debian/libltdl7.files libtool-2.4/debian/libltdl7.files
--- libtool-2.4/debian/libltdl7.files 2011-03-27 14:44:57.000000000 -0700
+++ libtool-2.4/debian/libltdl7.files 2011-10-25 17:40:51.000000000 -0700
@@ -1 +1 @@
-usr/lib/libltdl.so.*
+usr/lib/*/libltdl.so.*
diff -Nru libtool-2.4/debian/libltdl-dev.files libtool-2.4/debian/libltdl-dev.files
--- libtool-2.4/debian/libltdl-dev.files 2011-03-27 14:44:57.000000000 -0700
+++ libtool-2.4/debian/libltdl-dev.files 2011-10-25 17:40:39.000000000 -0700
@@ -1,6 +1,6 @@
usr/include
-usr/lib/libltdl.la
-usr/lib/libltdl.so
-usr/lib/libltdl.a
+usr/lib/*/libltdl.la
+usr/lib/*/libltdl.so
+usr/lib/*/libltdl.a
usr/share/aclocal/ltdl.m4
usr/share/libtool/libltdl
diff -Nru libtool-2.4/debian/rules libtool-2.4/debian/rules
--- libtool-2.4/debian/rules 2011-10-11 06:50:14.000000000 -0700
+++ libtool-2.4/debian/rules 2011-10-25 17:40:10.000000000 -0700
@@ -22,6 +22,7 @@
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
make_check = yes
@@ -88,7 +89,7 @@
sed -i -e 's/^#.*progname.*@VERSION@$$/& Debian-$(DEBIAN_REVISION)/' libltdl/config/ltmain.m4sh
sed -i -e 's/^VERSION.*/VERSION="@VERSION@ Debian-$(DEBIAN_REVISION)"/' libltdl/config/ltmain.m4sh
./bootstrap
- CONFIG_SHELL=/bin/bash /bin/bash ./configure --prefix=/usr $(confflags) CFLAGS="$(CFLAGS)"
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) $(confflags) CFLAGS="$(CFLAGS)"
touch config-stamp
