From 386d6592f802cc83c7bb3ab952c6cd216c338bdd Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 16 Sep 2022 04:22:24 -0700 Subject: [PATCH] libtool: update to 2.4.7. --- .../patches/0002-rename-with-sysroot.patch | 34 +++++++++---------- .../libtool/patches/fix-tests-grep-3.8.patch | 18 ++++++++++ srcpkgs/libtool/template | 17 +++++++--- 3 files changed, 47 insertions(+), 22 deletions(-) create mode 100644 srcpkgs/libtool/patches/fix-tests-grep-3.8.patch diff --git a/srcpkgs/libtool/patches/0002-rename-with-sysroot.patch b/srcpkgs/libtool/patches/0002-rename-with-sysroot.patch index 960873c04e24..152aace96c41 100644 --- a/srcpkgs/libtool/patches/0002-rename-with-sysroot.patch +++ b/srcpkgs/libtool/patches/0002-rename-with-sysroot.patch @@ -13,16 +13,16 @@ Jürgen Buchmüller --- a/configure 2015-02-15 17:14:34.000000000 +0100 +++ b/configure 2015-10-20 13:25:12.684906339 +0200 -@@ -824,7 +824,7 @@ +@@ -832,7 +832,7 @@ enable_fast_install with_aix_soname with_gnu_ld -with_sysroot +with_libtool_sysroot enable_libtool_lock + enable_cross_guesses ' - ac_precious_vars='build_alias -@@ -1487,7 +1487,8 @@ +@@ -1509,7 +1509,8 @@ shared library versioning (aka "SONAME") variant to provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -32,7 +32,7 @@ Jürgen Buchmüller compiler's sysroot if not specified). Some influential environment variables: -@@ -7389,29 +7390,29 @@ +@@ -7610,29 +7611,29 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -57,8 +57,8 @@ Jürgen Buchmüller fi ;; #( /*) -- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` +- lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -72,7 +72,7 @@ Jürgen Buchmüller esac --- a/libltdl/configure 2015-02-15 17:15:15.000000000 +0100 +++ b/libltdl/configure 2015-10-20 13:26:45.747914683 +0200 -@@ -775,7 +775,7 @@ +@@ -777,7 +777,7 @@ with_aix_soname enable_dependency_tracking with_gnu_ld @@ -81,7 +81,7 @@ Jürgen Buchmüller enable_libtool_lock enable_ltdl_install ' -@@ -1429,7 +1429,8 @@ +@@ -1442,7 +1442,8 @@ shared library versioning (aka "SONAME") variant to provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -91,7 +91,7 @@ Jürgen Buchmüller compiler's sysroot if not specified). Some influential environment variables: -@@ -6275,29 +6276,29 @@ +@@ -6397,29 +6398,29 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -116,8 +116,8 @@ Jürgen Buchmüller fi ;; #( /*) -- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` +- lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -243,14 +243,14 @@ Jürgen Buchmüller ]]) --- a/m4/libtool.m4 2015-01-20 17:15:19.000000000 +0100 +++ b/m4/libtool.m4 2015-10-20 15:40:04.020631813 +0200 -@@ -1245,29 +1245,29 @@ - # _LT_WITH_SYSROOT +@@ -1243,29 +1243,29 @@ # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], --[AC_MSG_CHECKING([for sysroot]) + [m4_require([_LT_DECL_SED])dnl +-AC_MSG_CHECKING([for sysroot]) -AC_ARG_WITH([sysroot], -[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], -+[AC_MSG_CHECKING([for libtool-sysroot]) ++AC_MSG_CHECKING([for libtool-sysroot]) +AC_ARG_WITH([libtool-sysroot], +[AS_HELP_STRING([--with-libtool-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -269,8 +269,8 @@ Jürgen Buchmüller fi ;; #( /*) -- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` +- lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( diff --git a/srcpkgs/libtool/patches/fix-tests-grep-3.8.patch b/srcpkgs/libtool/patches/fix-tests-grep-3.8.patch new file mode 100644 index 000000000000..2003a19a3eef --- /dev/null +++ b/srcpkgs/libtool/patches/fix-tests-grep-3.8.patch @@ -0,0 +1,18 @@ +--- a/tests/link-order.at ++++ b/tests/link-order.at +@@ -99,12 +99,12 @@ aix* | interix*) ;; # These systems hav + case $hardcode_direct$hardcode_direct_absolute in + yesno) + AT_CHECK([if $EGREP relinking stderr; then +- $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout ++ $EGREP " .*/new/lib/libb$shared_ext .*/old/lib/libcee$shared_ext" stdout + else :; fi], [0], [ignore], [], [echo "wrong link order"]) + ;; + *) + AT_CHECK([if $EGREP relinking stderr; then +- $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout ++ $EGREP " -L.*/new/lib -lb -L.*/old/lib -lcee" stdout + else :; fi], [0], [ignore], [], [echo "wrong link order"]) + ;; + esac + diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template index b9972df70341..59f4767a257a 100644 --- a/srcpkgs/libtool/template +++ b/srcpkgs/libtool/template @@ -1,7 +1,7 @@ # Template file for 'libtool' pkgname=libtool -version=2.4.6 -revision=6 +version=2.4.7 +revision=1 build_style=gnu-configure hostmakedepends="texinfo perl automake help2man xz" depends="tar sed" @@ -10,13 +10,22 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://www.gnu.org/software/libtool" distfiles="${GNU_SITE}/libtool/$pkgname-$version.tar.xz" -checksum=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f +checksum=4f7f217f057ce655ff22559ad221a0fd8ef84ad1fc5fcb6990cecc333aa1635d + +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + # Musl always searches LD_LIBRARY_PATH before RPATH and RUNPATH + configure_args="lt_cv_shlibpath_overrides_runpath=yes" +fi pre_configure() { touch aclocal.m4 libltdl/aclocal.m4 Makefile.am libltdl/Makefile.am Makefile.in libltdl/Makefile.in ./bootstrap --force } +post_configure() { + cat config.log +} + post_install() { local _canonical_host _host_os @@ -45,10 +54,8 @@ post_install() { _host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//') vsed -i \ -e "s,^host_alias=.*,host_alias=${_canonical_host}," \ - -e "s,^host=.*,host=${_canonical_host}," \ -e "s,^build_alias=.*,build_alias=${_canonical_host}," \ -e "s,^build=.*,build=${_canonical_host}," \ - -e "s,^build_os=.*,build_os=${_host_os}," \ ${PKGDESTDIR}/usr/bin/libtool fi }