From 5c13e3a0302d536db00b7d51701fe39f50a793d3 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 16 Sep 2022 04:22:24 -0700 Subject: [PATCH 1/4] libtool: update to 2.4.7. --- .../patches/0002-rename-with-sysroot.patch | 34 +++++++++---------- srcpkgs/libtool/template | 13 ++++--- 2 files changed, 25 insertions(+), 22 deletions(-) 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/template b/srcpkgs/libtool/template index b9972df70341..3df549462f5b 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,7 +10,12 @@ 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_LIBC" == "musl" ]; then +# Musl always searches LD_LIBRARY_PATH before RPATH and RUNPATH +make_build_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 @@ -45,10 +50,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 } From 54ca7bcb2f06fa5630aa8bb5991cf24414bd08a4 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 16 Sep 2022 04:23:21 -0700 Subject: [PATCH 2/4] libsasl: fix build for libtool 2.4.7 --- srcpkgs/libsasl/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template index a8817042f843..a2993b39f4a1 100644 --- a/srcpkgs/libsasl/template +++ b/srcpkgs/libsasl/template @@ -19,6 +19,7 @@ distfiles="https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl- checksum=26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5 pre_configure() { + rm -f m4/ltversion.m4 autoreconf -fi } From f3f3a3f594e4d08dbac2814fd48fd76fca690324 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 16 Sep 2022 04:24:51 -0700 Subject: [PATCH 3/4] subversion: fix build for libtool 2.4.7 --- srcpkgs/subversion/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template index 8ad178264942..316a731fe4bf 100644 --- a/srcpkgs/subversion/template +++ b/srcpkgs/subversion/template @@ -53,11 +53,13 @@ pre_configure() { cp "$XBPS_CROSS_BASE/usr/lib/perl5/core_perl/Config"*.p? $PERL5LIB cp "$XBPS_CROSS_BASE/usr/lib/perl5/core_perl/Errno.pm" $PERL5LIB vsed -e "s;archlibexp => '\(.*\)';archlibexp => '${XBPS_CROSS_BASE}\1';" \ - -i $PERL5LIB/Config.pm $PERL5LIB/Config_heavy.pl + -i $PERL5LIB/Config.pm + vsed -e "s;archlibexp='\(.*\)';archlibexp='${XBPS_CROSS_BASE}\1';" \ + -i $PERL5LIB/Config_heavy.pl else configure_args+=" --with-apxs" fi - NOCONFIGURE=1 autoreconf -fi + ./autogen.sh --release } post_configure() { From 0454522c18b0e53fcb8bcfc6a60f7f8b1420b1f6 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 16 Sep 2022 05:01:38 -0700 Subject: [PATCH 4/4] subversion-kwallet-auth: update to 1.14.2. Fix failing distfiles. Fix build for libtool 2.4.7 --- srcpkgs/subversion-kwallet-auth/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template index 12210f250d51..205be39e0dd4 100644 --- a/srcpkgs/subversion-kwallet-auth/template +++ b/srcpkgs/subversion-kwallet-auth/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/subversion". # pkgname=subversion-kwallet-auth -version=1.14.1 +version=1.14.2 revision=1 wrksrc="subversion-${version}" build_style=gnu-configure @@ -22,7 +22,7 @@ license="Apache-2.0, BSD-3-Clause" homepage="http://subversion.apache.org/" changelog="https://subversion.apache.org/docs/release-notes/${version%.*}.html" distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2" -checksum=2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9 +checksum=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28 lib32disabled=yes pre_configure() { @@ -55,11 +55,13 @@ pre_configure() { cp "$XBPS_CROSS_BASE/usr/lib/perl5/core_perl/Config"*.p? $PERL5LIB cp "$XBPS_CROSS_BASE/usr/lib/perl5/core_perl/Errno.pm" $PERL5LIB vsed -e "s;archlibexp => '\(.*\)';archlibexp => '${XBPS_CROSS_BASE}\1';" \ - -i $PERL5LIB/Config.pm $PERL5LIB/Config_heavy.pl + -i $PERL5LIB/Config.pm + vsed -e "s;archlibexp='\(.*\)';archlibexp='${XBPS_CROSS_BASE}\1';" \ + -i $PERL5LIB/Config_heavy.pl else configure_args+=" --with-apxs" fi - NOCONFIGURE=1 autoreconf -fi + ./autogen.sh --release } post_configure() {