diff options
| author | James McCoy <jamessan@debian.org> | 2014-09-25 00:51:50 +0000 |
|---|---|---|
| committer | James McCoy <jamessan@debian.org> | 2014-09-25 00:51:50 +0000 |
| commit | 61c1cf767db27c0c51c224c915f594e717943107 (patch) | |
| tree | 5ff42f42c50679969fcc88b0d137851a0e556b2e /debian/patches | |
| parent | d63846ec093105aad53b26e66ad10062f7693dd3 (diff) | |
Add patches/libtoolize from upstream to support the Multi-Arch libtool
packaging. (Closes: #761789)
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/libtoolize | 49 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 50 insertions, 0 deletions
diff --git a/debian/patches/libtoolize b/debian/patches/libtoolize new file mode 100644 index 0000000..dc18786 --- /dev/null +++ b/debian/patches/libtoolize @@ -0,0 +1,49 @@ +------------------------------------------------------------------------ +r1627276 | philip | 2014-09-24 06:58:12 -0400 (Wed, 24 Sep 2014) | 8 lines + +* buildcheck.sh: Look for libtoolize rather than libtool, add some + more candidate names. + +* autogen.sh: Add more candidate names to match buildcheck.sh. + +Patch by: Helmut Grohne <helmut{_AT_}subdivi.de> + me + + +Index: trunk/build/buildcheck.sh +=================================================================== +--- trunk/build/buildcheck.sh (revision 1627275) ++++ trunk/build/buildcheck.sh (revision 1627276) +@@ -97,14 +97,14 @@ + esac + fi + +-libtool=${LIBTOOL:-`./build/PrintPath glibtool libtool libtool15`} ++libtoolize=${LIBTOOLIZE:-`./build/PrintPath glibtoolize libtoolize glibtoolize1 libtoolize15 libtoolize14`} + # Extract the libtool version number: everything from the first number in + # the version text until a hyphen or space. +-lt_pversion=`$libtool --version 2>/dev/null | ++lt_pversion=`$libtoolize --version 2>/dev/null | + sed -e 's/^[^0-9]*//' -e 's/[- ].*//' -e '/^$/d' | + sed -e 1q` + if test -z "$lt_pversion"; then +- echo "buildcheck: libtool not found." ++ echo "buildcheck: libtoolize not found." + echo " You need libtool version $LIBTOOL_WANTED_VERSION or newer installed" + exit 1 + fi +Index: trunk/autogen.sh +=================================================================== +--- trunk/autogen.sh (revision 1627275) ++++ trunk/autogen.sh (revision 1627276) +@@ -59,7 +59,7 @@ + # ### APR's libtool. deferring to a second round of change... + # + +-libtoolize="`./build/PrintPath glibtoolize libtoolize libtoolize15`" ++libtoolize="`./build/PrintPath glibtoolize libtoolize glibtoolize1 libtoolize15 libtoolize14`" + lt_major_version=`$libtoolize --version 2>/dev/null | sed -e 's/^[^0-9]*//' -e 's/\..*//' -e '/^$/d' -e 1q` + + if [ "x$libtoolize" = "x" ]; then + +------------------------------------------------------------------------ diff --git a/debian/patches/series b/debian/patches/series index 31f664f..353dd8b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,3 +17,4 @@ apache_module_dependency workaround_EINVAL_on_kfreebsd ruby2.0-build-fixes test-failure-with-optimizations +libtoolize |