* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
@ 2022-09-16 12:02 ` oreo639
2022-09-16 12:09 ` oreo639
` (47 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 12:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as apart of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 7923 bytes --]
From 7f0b9e420624a6d8a3b043f2d5ee586e41b59e44 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 11 ++++--
2 files changed, 25 insertions(+), 20 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..70c4aa533e66 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 <gottox@voidlinux.org>"
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
From 91d115355adbaa40d0115d019989651bd6837c7b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 15944d58daeaa2b935198d1f47304ae044b2bf6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:24:51 -0700
Subject: [PATCH 3/4] subversion: fix build for libtool 2.4.7
---
srcpkgs/subversion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 8ad178264942..3f1c9e254e61 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -57,7 +57,7 @@ pre_configure() {
else
configure_args+=" --with-apxs"
fi
- NOCONFIGURE=1 autoreconf -fi
+ ./autogen.sh --release
}
post_configure() {
From 39d597c319b5b7c003ea3f63a033a7decc286936 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 05:01:38 -0700
Subject: [PATCH 4/4] subversion-kwallet-auth: update to 1.14.2.
Fix failing distfiles.
Rebuild for libtool 2.4.7
---
srcpkgs/subversion-kwallet-auth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 12210f250d51..efecc5f7e382 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
@@ -59,7 +59,7 @@ pre_configure() {
else
configure_args+=" --with-apxs"
fi
- NOCONFIGURE=1 autoreconf -fi
+ ./autogen.sh --release
}
post_configure() {
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
2022-09-16 12:02 ` [PR PATCH] [Updated] libtool: update to 2.4.7 oreo639
@ 2022-09-16 12:09 ` oreo639
2022-09-16 12:11 ` oreo639
` (46 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 12:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as apart of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 8362 bytes --]
From 5c13e3a0302d536db00b7d51701fe39f50a793d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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 <gottox@voidlinux.org>"
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 <oreo6391@gmail.com>
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 2106f330ec55e8c8ac2ce19f793c8a9d26528a84 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:24:51 -0700
Subject: [PATCH 3/4] subversion: fix build for libtool 2.4.7
---
srcpkgs/subversion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 8ad178264942..3f1c9e254e61 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -57,7 +57,7 @@ pre_configure() {
else
configure_args+=" --with-apxs"
fi
- NOCONFIGURE=1 autoreconf -fi
+ ./autogen.sh --release
}
post_configure() {
From f09d138c6e58fa601680070023b0ab1d33d2eeaa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 05:01:38 -0700
Subject: [PATCH 4/4] subversion-kwallet-auth: update to 1.14.2.
Fix failing distfiles.
Rebuild for libtool 2.4.7
---
srcpkgs/subversion-kwallet-auth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 12210f250d51..efecc5f7e382 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
@@ -59,7 +59,7 @@ pre_configure() {
else
configure_args+=" --with-apxs"
fi
- NOCONFIGURE=1 autoreconf -fi
+ ./autogen.sh --release
}
post_configure() {
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
2022-09-16 12:02 ` [PR PATCH] [Updated] libtool: update to 2.4.7 oreo639
2022-09-16 12:09 ` oreo639
@ 2022-09-16 12:11 ` oreo639
2022-09-16 12:16 ` oreo639
` (45 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 12:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as apart of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 8364 bytes --]
From 5c13e3a0302d536db00b7d51701fe39f50a793d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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 <gottox@voidlinux.org>"
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 <oreo6391@gmail.com>
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 2106f330ec55e8c8ac2ce19f793c8a9d26528a84 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:24:51 -0700
Subject: [PATCH 3/4] subversion: fix build for libtool 2.4.7
---
srcpkgs/subversion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 8ad178264942..3f1c9e254e61 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -57,7 +57,7 @@ pre_configure() {
else
configure_args+=" --with-apxs"
fi
- NOCONFIGURE=1 autoreconf -fi
+ ./autogen.sh --release
}
post_configure() {
From 65ef860c13f76cb03eb11325dcc00620f70c7a1f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 12210f250d51..efecc5f7e382 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
@@ -59,7 +59,7 @@ pre_configure() {
else
configure_args+=" --with-apxs"
fi
- NOCONFIGURE=1 autoreconf -fi
+ ./autogen.sh --release
}
post_configure() {
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (2 preceding siblings ...)
2022-09-16 12:11 ` oreo639
@ 2022-09-16 12:16 ` oreo639
2022-09-16 12:34 ` oreo639
` (44 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 12:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as apart of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 8809 bytes --]
From 5c13e3a0302d536db00b7d51701fe39f50a793d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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 <gottox@voidlinux.org>"
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 <oreo6391@gmail.com>
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 2106f330ec55e8c8ac2ce19f793c8a9d26528a84 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:24:51 -0700
Subject: [PATCH 3/4] subversion: fix build for libtool 2.4.7
---
srcpkgs/subversion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 8ad178264942..3f1c9e254e61 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -57,7 +57,7 @@ pre_configure() {
else
configure_args+=" --with-apxs"
fi
- NOCONFIGURE=1 autoreconf -fi
+ ./autogen.sh --release
}
post_configure() {
From d9f5114e512217d539160bc4136c77a0526f6a8b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 12210f250d51..0cf221d6e1c3 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() {
@@ -59,7 +59,7 @@ pre_configure() {
else
configure_args+=" --with-apxs"
fi
- NOCONFIGURE=1 autoreconf -fi
+ ./autogen.sh --release
}
post_configure() {
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (3 preceding siblings ...)
2022-09-16 12:16 ` oreo639
@ 2022-09-16 12:34 ` oreo639
2022-09-16 12:35 ` oreo639
` (43 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 12:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as apart of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 9730 bytes --]
From 5c13e3a0302d536db00b7d51701fe39f50a793d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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 <gottox@voidlinux.org>"
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 <oreo6391@gmail.com>
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 578ed8177d7c469729aa5c7fe0f01bbf5fa5d055 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:24:51 -0700
Subject: [PATCH 3/4] subversion: fix build for libtool 2.4.7
---
srcpkgs/subversion/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 8ad178264942..c8f992129938 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -52,12 +52,14 @@ pre_configure() {
mkdir -p $PERL5LIB
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
+ vsed -e "s;archlibexp => '\(.*\)';archlibexp => '${XBPS_CROSS_BASE}\1';" \
+ -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 b3e26afa54e9f619f859a7bdb4aef284c26a996f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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() {
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (4 preceding siblings ...)
2022-09-16 12:34 ` oreo639
@ 2022-09-16 12:35 ` oreo639
2022-09-16 13:04 ` oreo639
` (42 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 12:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as apart of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 9626 bytes --]
From 5c13e3a0302d536db00b7d51701fe39f50a793d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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 <gottox@voidlinux.org>"
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 <oreo6391@gmail.com>
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 <oreo6391@gmail.com>
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 <oreo6391@gmail.com>
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() {
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (5 preceding siblings ...)
2022-09-16 12:35 ` oreo639
@ 2022-09-16 13:04 ` oreo639
2022-09-16 14:28 ` oreo639
` (41 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as apart of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 10092 bytes --]
From 5c13e3a0302d536db00b7d51701fe39f50a793d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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 <gottox@voidlinux.org>"
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 <oreo6391@gmail.com>
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 6bdca375c041cd25a4cca2c39603ea8e2fd2a5ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:24:51 -0700
Subject: [PATCH 3/4] subversion: fix build for libtool 2.4.7
---
srcpkgs/subversion/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 8ad178264942..98dbcfe10905 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -24,6 +24,8 @@ distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
checksum=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
pre_configure() {
+ ./autogen.sh --release
+
# Based on native build values
cat <<-EOF >config.cache
ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -53,11 +55,12 @@ 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
}
post_configure() {
From 5c7b1ceb8ff8d64e7c4dc739bf5fc11ce6e876d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 12210f250d51..e3270baaa002 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,10 +22,12 @@ 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() {
+ ./autogen.sh --release
+
# Based on native build values
cat <<-EOF >config.cache
ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -55,11 +57,12 @@ 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
}
post_configure() {
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (6 preceding siblings ...)
2022-09-16 13:04 ` oreo639
@ 2022-09-16 14:28 ` oreo639
2022-09-16 14:31 ` oreo639
` (40 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 14:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as apart of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 10671 bytes --]
From 5c13e3a0302d536db00b7d51701fe39f50a793d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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 <gottox@voidlinux.org>"
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 <oreo6391@gmail.com>
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 717aa2a2ad51b12052405b1f74134d62faf22d72 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:24:51 -0700
Subject: [PATCH 3/4] subversion: fix build for libtool 2.4.7
---
srcpkgs/subversion/template | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 8ad178264942..65f3df5a8130 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -24,6 +24,8 @@ distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
checksum=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
pre_configure() {
+ ./autogen.sh --release
+
# Based on native build values
cat <<-EOF >config.cache
ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -53,11 +55,18 @@ 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
+
+ if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+ # This test will fail when run as the root user,
+ # because flock() will ignore file permissions.
+ vsed -i subversion/tests/libsvn_fs/locks-test.c -e '/SVN_TEST_OPTS_PASS(obtain_write_lock_failure,/,+2d'
+ else
}
post_configure() {
From 9b8e2bf63a09b06b42df1065b2aaaf24df4cb8a9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 12210f250d51..9a4cd594e0b2 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,10 +22,12 @@ 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() {
+ ./autogen.sh --release
+
# Based on native build values
cat <<-EOF >config.cache
ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -55,11 +57,18 @@ 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
+
+ if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+ # This test will fail when run as the root user,
+ # because flock() will ignore file permissions.
+ vsed -i subversion/tests/libsvn_fs/locks-test.c -e '/SVN_TEST_OPTS_PASS(obtain_write_lock_failure,/,+2d'
+ else
}
post_configure() {
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (7 preceding siblings ...)
2022-09-16 14:28 ` oreo639
@ 2022-09-16 14:31 ` oreo639
2022-09-16 14:45 ` oreo639
` (39 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 14:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as apart of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 10667 bytes --]
From 5c13e3a0302d536db00b7d51701fe39f50a793d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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 <gottox@voidlinux.org>"
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 <oreo6391@gmail.com>
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 661fb7d1a56aec1f222795a03734c97a1043008c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:24:51 -0700
Subject: [PATCH 3/4] subversion: fix build for libtool 2.4.7
---
srcpkgs/subversion/template | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 8ad178264942..f01e8aa597fb 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -24,6 +24,8 @@ distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
checksum=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
pre_configure() {
+ ./autogen.sh --release
+
# Based on native build values
cat <<-EOF >config.cache
ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -53,11 +55,18 @@ 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
+
+ if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+ # This test will fail when run as the root user,
+ # because flock() will ignore file permissions.
+ vsed -i subversion/tests/libsvn_fs/locks-test.c -e '/SVN_TEST_OPTS_PASS(obtain_write_lock_failure,/,+2d'
+ fi
}
post_configure() {
From 114a601c841e842c7d26e1a7320956eb3250c2e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 12210f250d51..a9ca8c81d08e 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,10 +22,12 @@ 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() {
+ ./autogen.sh --release
+
# Based on native build values
cat <<-EOF >config.cache
ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -55,11 +57,18 @@ 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
+
+ if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+ # This test will fail when run as the root user,
+ # because flock() will ignore file permissions.
+ vsed -i subversion/tests/libsvn_fs/locks-test.c -e '/SVN_TEST_OPTS_PASS(obtain_write_lock_failure,/,+2d'
+ fi
}
post_configure() {
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (8 preceding siblings ...)
2022-09-16 14:31 ` oreo639
@ 2022-09-16 14:45 ` oreo639
2022-09-16 14:57 ` oreo639
` (38 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 14:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as apart of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 10669 bytes --]
From 5c13e3a0302d536db00b7d51701fe39f50a793d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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 <gottox@voidlinux.org>"
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 <oreo6391@gmail.com>
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 dba412f2c7e7f4c6d3ca9107a92e9309fa044159 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:24:51 -0700
Subject: [PATCH 3/4] subversion: fix build for libtool 2.4.7
---
srcpkgs/subversion/template | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 8ad178264942..b1ffa9aa4055 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -24,6 +24,8 @@ distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
checksum=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
pre_configure() {
+ ./autogen.sh --release
+
# Based on native build values
cat <<-EOF >config.cache
ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -53,11 +55,18 @@ 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
+
+ if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+ # This test will fail when run as the root user,
+ # because flock() will ignore file permissions.
+ vsed -i subversion/tests/libsvn_fs/locks-test.c -e '/SVN_TEST_OPTS_PASS(obtain_write_lock_failure,/,\+2d'
+ fi
}
post_configure() {
From d3eab4ea30937d0e213ce15209a173a7a5ccb28b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 12210f250d51..ab9b72a23ce8 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,10 +22,12 @@ 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() {
+ ./autogen.sh --release
+
# Based on native build values
cat <<-EOF >config.cache
ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -55,11 +57,18 @@ 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
+
+ if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+ # This test will fail when run as the root user,
+ # because flock() will ignore file permissions.
+ vsed -i subversion/tests/libsvn_fs/locks-test.c -e '/SVN_TEST_OPTS_PASS(obtain_write_lock_failure,/,\+2d'
+ fi
}
post_configure() {
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (9 preceding siblings ...)
2022-09-16 14:45 ` oreo639
@ 2022-09-16 14:57 ` oreo639
2022-09-16 17:38 ` [PR REVIEW] " paper42
` (37 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 14:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as apart of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 10667 bytes --]
From 5c13e3a0302d536db00b7d51701fe39f50a793d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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 <gottox@voidlinux.org>"
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 <oreo6391@gmail.com>
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 aa9004ed854da92985605cc89d36655dc5cf053a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:24:51 -0700
Subject: [PATCH 3/4] subversion: fix build for libtool 2.4.7
---
srcpkgs/subversion/template | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 8ad178264942..c21467b46708 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -24,6 +24,8 @@ distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
checksum=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
pre_configure() {
+ ./autogen.sh --release
+
# Based on native build values
cat <<-EOF >config.cache
ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -53,11 +55,18 @@ 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
+
+ if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+ # This test will fail when run as the root user,
+ # because flock() will ignore file permissions.
+ vsed -i subversion/tests/libsvn_fs/locks-test.c -e '/SVN_TEST_OPTS_PASS(obtain_write_lock_failure,/,+3d'
+ fi
}
post_configure() {
From 6f0d67a787c64e8d4932db6dee66c65b342d836b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 12210f250d51..9cc68c3fe5f1 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,10 +22,12 @@ 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() {
+ ./autogen.sh --release
+
# Based on native build values
cat <<-EOF >config.cache
ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -55,11 +57,18 @@ 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
+
+ if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+ # This test will fail when run as the root user,
+ # because flock() will ignore file permissions.
+ vsed -i subversion/tests/libsvn_fs/locks-test.c -e '/SVN_TEST_OPTS_PASS(obtain_write_lock_failure,/,+3d'
+ fi
}
post_configure() {
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR REVIEW] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (10 preceding siblings ...)
2022-09-16 14:57 ` oreo639
@ 2022-09-16 17:38 ` paper42
2022-09-16 17:38 ` paper42
` (36 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: paper42 @ 2022-09-16 17:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#discussion_r972937158
Comment:
indent
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR REVIEW] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (11 preceding siblings ...)
2022-09-16 17:38 ` [PR REVIEW] " paper42
@ 2022-09-16 17:38 ` paper42
2022-09-16 17:50 ` dkwo
` (35 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: paper42 @ 2022-09-16 17:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#discussion_r972937707
Comment:
put this to post_extract, drop -f (because extract can only run once) and add a comment why it's necessary
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (12 preceding siblings ...)
2022-09-16 17:38 ` paper42
@ 2022-09-16 17:50 ` dkwo
2022-09-16 22:40 ` [PR REVIEW] " oreo639
` (34 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: dkwo @ 2022-09-16 17:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1249641436
Comment:
I wonder if this also fixes the failing `ntl` build on aarch64-musl https://github.com/void-linux/void-packages/issues/37497
I'll have a machine to test it in a few weeks.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR REVIEW] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (13 preceding siblings ...)
2022-09-16 17:50 ` dkwo
@ 2022-09-16 22:40 ` oreo639
2022-09-16 22:40 ` oreo639
` (33 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 22:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#discussion_r973489958
Comment:
It doesn't seem to be necessary anymore.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR REVIEW] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (14 preceding siblings ...)
2022-09-16 22:40 ` [PR REVIEW] " oreo639
@ 2022-09-16 22:40 ` oreo639
2022-09-16 22:42 ` oreo639
` (32 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 22:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#discussion_r973489958
Comment:
It doesn't seem to be necessary anymore. (either in this PR or in the gcc12 pr)
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR REVIEW] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (15 preceding siblings ...)
2022-09-16 22:40 ` oreo639
@ 2022-09-16 22:42 ` oreo639
2022-09-16 22:43 ` oreo639
` (31 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 22:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#discussion_r973489958
Comment:
It doesn't seem to be necessary anymore to force ltversion to be regenerated. (either in this PR or in the gcc12 pr)
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR REVIEW] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (16 preceding siblings ...)
2022-09-16 22:42 ` oreo639
@ 2022-09-16 22:43 ` oreo639
2022-09-16 22:43 ` [PR PATCH] [Updated] " oreo639
` (30 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 22:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#discussion_r973489958
Comment:
It doesn't seem to be necessary anymore. (either in this PR or in the gcc12 pr)
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (17 preceding siblings ...)
2022-09-16 22:43 ` oreo639
@ 2022-09-16 22:43 ` oreo639
2022-10-05 18:02 ` dkwo
` (29 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-09-16 22:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 9988 bytes --]
From 8075cf7f4c1ee3fbdc4656d6142598f15095cce1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:22:24 -0700
Subject: [PATCH 1/3] 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..74a385352a16 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 <gottox@voidlinux.org>"
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 4a190f2f77b62518a8395cf0bc0367b73a6e529a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:24:51 -0700
Subject: [PATCH 2/3] subversion: fix build for libtool 2.4.7
---
srcpkgs/subversion/template | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 8ad178264942..c21467b46708 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -24,6 +24,8 @@ distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
checksum=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
pre_configure() {
+ ./autogen.sh --release
+
# Based on native build values
cat <<-EOF >config.cache
ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -53,11 +55,18 @@ 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
+
+ if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+ # This test will fail when run as the root user,
+ # because flock() will ignore file permissions.
+ vsed -i subversion/tests/libsvn_fs/locks-test.c -e '/SVN_TEST_OPTS_PASS(obtain_write_lock_failure,/,+3d'
+ fi
}
post_configure() {
From db4c4e272ad83a5d7e762a9c4e0351e495f7a268 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 05:01:38 -0700
Subject: [PATCH 3/3] subversion-kwallet-auth: update to 1.14.2.
Fix failing distfiles.
Fix build for libtool 2.4.7
---
srcpkgs/subversion-kwallet-auth/template | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 12210f250d51..9cc68c3fe5f1 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,10 +22,12 @@ 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() {
+ ./autogen.sh --release
+
# Based on native build values
cat <<-EOF >config.cache
ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -55,11 +57,18 @@ 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
+
+ if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+ # This test will fail when run as the root user,
+ # because flock() will ignore file permissions.
+ vsed -i subversion/tests/libsvn_fs/locks-test.c -e '/SVN_TEST_OPTS_PASS(obtain_write_lock_failure,/,+3d'
+ fi
}
post_configure() {
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (18 preceding siblings ...)
2022-09-16 22:43 ` [PR PATCH] [Updated] " oreo639
@ 2022-10-05 18:02 ` dkwo
2022-10-10 13:56 ` dkwo
` (28 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: dkwo @ 2022-10-05 18:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1268762531
Comment:
@paper42 Do you have a quick way of building ntl natively on aarch64-musl using this pr?
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (19 preceding siblings ...)
2022-10-05 18:02 ` dkwo
@ 2022-10-10 13:56 ` dkwo
2022-11-16 14:18 ` dkwo
` (27 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: dkwo @ 2022-10-10 13:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1273354501
Comment:
Built and checked this PR for `aarch64-musl`.
It also fixes the previously reported `ntl` build failure #37497 @tornaria
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (20 preceding siblings ...)
2022-10-10 13:56 ` dkwo
@ 2022-11-16 14:18 ` dkwo
2022-11-16 17:23 ` oreo639
` (26 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: dkwo @ 2022-11-16 14:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1317094440
Comment:
@oreo639 what is the status of this? can you rebase it?
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (21 preceding siblings ...)
2022-11-16 14:18 ` dkwo
@ 2022-11-16 17:23 ` oreo639
2022-11-16 17:24 ` oreo639
` (25 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 17:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1317384362
Comment:
It's a lot of work maintaining 3 separate PRs and keeping them in sync so I wanted to make sure this doesn't get merged with an outdated changeset.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (22 preceding siblings ...)
2022-11-16 17:23 ` oreo639
@ 2022-11-16 17:24 ` oreo639
2022-11-16 17:26 ` oreo639
` (24 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 17:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1317384362
Comment:
> what is the status of this?
It's a lot of work maintaining 3 separate PRs and keeping them in sync so I wanted to make sure this doesn't get merged with an outdated changeset.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (23 preceding siblings ...)
2022-11-16 17:24 ` oreo639
@ 2022-11-16 17:26 ` oreo639
2022-11-16 17:28 ` [PR PATCH] [Updated] " oreo639
` (23 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 17:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 344 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1317384362
Comment:
> what is the status of this?
It's a lot of work maintaining 3 separate PRs with the same changes and keeping them in sync so I wanted to make sure this doesn't get merged with an outdated changeset.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (24 preceding siblings ...)
2022-11-16 17:26 ` oreo639
@ 2022-11-16 17:28 ` oreo639
2022-11-16 17:32 ` oreo639
` (22 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 17:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 6069 bytes --]
From 84bea5d687dc9d25288fc56a6a0f5a3fd291c1bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:22:24 -0700
Subject: [PATCH] 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..74a385352a16 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 <gottox@voidlinux.org>"
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
}
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (25 preceding siblings ...)
2022-11-16 17:28 ` [PR PATCH] [Updated] " oreo639
@ 2022-11-16 17:32 ` oreo639
2022-11-16 17:33 ` oreo639
` (21 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 17:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 6076 bytes --]
From b51cea02fdb9d399a18420d8031a5e14fd1eb2ad Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:22:24 -0700
Subject: [PATCH] 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..e00e83f927d8 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 <gottox@voidlinux.org>"
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
+ 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
}
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (26 preceding siblings ...)
2022-11-16 17:32 ` oreo639
@ 2022-11-16 17:33 ` oreo639
2022-11-16 17:35 ` oreo639
` (20 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 17:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 248 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1317384362
Comment:
> what is the status of this?
I wanted to make sure this doesn't get merged with an outdated changeset.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (27 preceding siblings ...)
2022-11-16 17:33 ` oreo639
@ 2022-11-16 17:35 ` oreo639
2022-11-16 20:53 ` oreo639
` (19 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 17:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1317384362
Comment:
> what is the status of this?
I wanted to make sure this didn't get merged with an outdated changeset.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (28 preceding siblings ...)
2022-11-16 17:35 ` oreo639
@ 2022-11-16 20:53 ` oreo639
2022-11-16 20:57 ` oreo639
` (18 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1317655579
Comment:
The libtool tests are failing due to the grep update.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (29 preceding siblings ...)
2022-11-16 20:53 ` oreo639
@ 2022-11-16 20:57 ` oreo639
2022-11-16 21:04 ` oreo639
` (17 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 20:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1317655579
Comment:
The libtool tests are failing due to the grep update. (it expects `\\` to become to `\` with egrep)
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (30 preceding siblings ...)
2022-11-16 20:57 ` oreo639
@ 2022-11-16 21:04 ` oreo639
2022-11-16 21:26 ` [PR PATCH] [Updated] " oreo639
` (16 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 21:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1317655579
Comment:
The libtool tests are failing due to the grep update.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (31 preceding siblings ...)
2022-11-16 21:04 ` oreo639
@ 2022-11-16 21:26 ` oreo639
2022-11-16 21:29 ` oreo639
` (15 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 21:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 7216 bytes --]
From 4a9f8ce75e52959b216d7d6b8decd9a65d913896 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 13 ++++---
3 files changed, 43 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..e00e83f927d8 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 <gottox@voidlinux.org>"
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
+ 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
}
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (32 preceding siblings ...)
2022-11-16 21:26 ` [PR PATCH] [Updated] " oreo639
@ 2022-11-16 21:29 ` oreo639
2022-11-16 21:58 ` [PR PATCH] [Updated] " oreo639
` (14 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 21:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1317384362
Comment:
> what is the status of this?
I temporarily marked it as a draft because wanted to make sure this didn't get merged with an outdated changeset.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (33 preceding siblings ...)
2022-11-16 21:29 ` oreo639
@ 2022-11-16 21:58 ` oreo639
2022-11-16 23:36 ` oreo639
` (13 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 21:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 7215 bytes --]
From 975f251455315769163c8546f1a38e9d1e97ec77 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 13 ++++---
3 files changed, 43 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..bdb0f5884035 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 <gottox@voidlinux.org>"
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
+ 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
}
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (34 preceding siblings ...)
2022-11-16 21:58 ` [PR PATCH] [Updated] " oreo639
@ 2022-11-16 23:36 ` oreo639
2022-11-16 23:45 ` oreo639
` (12 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 23:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 7249 bytes --]
From cea6deaa9662881306addf19b945e9586d8f553b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 15 +++++---
3 files changed, 45 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..52a83bf8bb62 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,14 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
+ make_build_args="lt_cv_shlibpath_overrides_runpath=yes"
+fi
+
+echo "libc $XBPS_TARGET_LIBC"
pre_configure() {
touch aclocal.m4 libltdl/aclocal.m4 Makefile.am libltdl/Makefile.am Makefile.in libltdl/Makefile.in
@@ -45,10 +52,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
}
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (35 preceding siblings ...)
2022-11-16 23:36 ` oreo639
@ 2022-11-16 23:45 ` oreo639
2022-11-16 23:58 ` oreo639
` (11 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 23:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 7039 bytes --]
From 46cb5211e5e270fc37e852fcf45e693b9b12150f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 8 ++---
3 files changed, 38 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..924f3b265561 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,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
pre_configure() {
touch aclocal.m4 libltdl/aclocal.m4 Makefile.am libltdl/Makefile.am Makefile.in libltdl/Makefile.in
@@ -45,10 +45,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
}
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (36 preceding siblings ...)
2022-11-16 23:45 ` oreo639
@ 2022-11-16 23:58 ` oreo639
2022-11-17 0:24 ` oreo639
` (10 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-16 23:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 7355 bytes --]
From 82fba213c58d78d6dd4400f74d7d846f50759f03 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 18 +++++++---
3 files changed, 48 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..bebba645dff9 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,23 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
+ make_build_args="lt_cv_shlibpath_overrides_runpath=yes"
+ echo "flag"
+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 +55,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
}
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (37 preceding siblings ...)
2022-11-16 23:58 ` oreo639
@ 2022-11-17 0:24 ` oreo639
2022-11-17 0:31 ` oreo639
` (9 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-17 0:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 7340 bytes --]
From 386d6592f802cc83c7bb3ab952c6cd216c338bdd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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 <gottox@voidlinux.org>"
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
}
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (38 preceding siblings ...)
2022-11-17 0:24 ` oreo639
@ 2022-11-17 0:31 ` oreo639
2022-11-17 0:40 ` oreo639
` (8 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-17 0:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 7214 bytes --]
From 19e6fa2825e5e0cbe87719f4332a55d95892edd4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 13 ++++---
3 files changed, 43 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..1b613cd15523 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 <gottox@voidlinux.org>"
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
@@ -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
}
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (39 preceding siblings ...)
2022-11-17 0:31 ` oreo639
@ 2022-11-17 0:40 ` oreo639
2022-11-17 1:53 ` oreo639
` (7 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-17 0:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 7214 bytes --]
From db77304fab2cce688b8161a311feb5915ab615b4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 13 ++++---
3 files changed, 43 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..1b613cd15523 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 <gottox@voidlinux.org>"
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
@@ -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
}
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (40 preceding siblings ...)
2022-11-17 0:40 ` oreo639
@ 2022-11-17 1:53 ` oreo639
2022-11-17 17:46 ` oreo639
` (6 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-17 1:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 7247 bytes --]
From 2621d18cb03d5675647fd9b7abc9903a2e1e330c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 13 ++++---
3 files changed, 44 insertions(+), 21 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..d2a15ff3e414 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 <gottox@voidlinux.org>"
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
@@ -45,9 +50,9 @@ 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=," \
-e "s,^build_os=.*,build_os=${_host_os}," \
${PKGDESTDIR}/usr/bin/libtool
fi
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (41 preceding siblings ...)
2022-11-17 1:53 ` oreo639
@ 2022-11-17 17:46 ` oreo639
2022-11-17 17:56 ` oreo639
` (5 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-17 17:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 7492 bytes --]
From 50c183bef865568f14f8ed6c3ac2a5e7dd4089cf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 20 ++++++++---
3 files changed, 50 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..fc5c53a9c3e9 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 <gottox@voidlinux.org>"
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
@@ -45,11 +50,16 @@ 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
+
+ # The host_os and build_os can be the same (i.e. linux-musl or linux-gnu)
+ if ! grep "build_os=${_host_os}" ${PKGDESTDIR}/usr/bin/libtool >/dev/null 2>&1; then
+ vsed -i \
+ -e "s,^build_os=.*,build_os=${_host_os}," \
+ ${PKGDESTDIR}/usr/bin/libtool
+ fi
fi
}
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (42 preceding siblings ...)
2022-11-17 17:46 ` oreo639
@ 2022-11-17 17:56 ` oreo639
2022-11-17 20:15 ` [PR PATCH] [Merged]: " paper42
` (4 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-17 17:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/39313
libtool: update to 2.4.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-39313.patch --]
[-- Type: text/x-diff, Size: 7611 bytes --]
From b255a33115e72d753a90432950c3864be983606e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:22:24 -0700
Subject: [PATCH] libtool: update to 2.4.7.
Removed vsed host=${_canonical_host} because _canonical_host is derrived from
host, so they should always be the same.
---
.../patches/0002-rename-with-sysroot.patch | 34 +++++++++----------
.../libtool/patches/fix-tests-grep-3.8.patch | 18 ++++++++++
srcpkgs/libtool/template | 20 ++++++++---
3 files changed, 50 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 <pullmoll@t-online.de>
--- 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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
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 <pullmoll@t-online.de>
]])
--- 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 <pullmoll@t-online.de>
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..fc5c53a9c3e9 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 <gottox@voidlinux.org>"
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
@@ -45,11 +50,16 @@ 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
+
+ # The host_os and build_os can be the same (i.e. linux-musl or linux-gnu)
+ if ! grep "build_os=${_host_os}" ${PKGDESTDIR}/usr/bin/libtool >/dev/null 2>&1; then
+ vsed -i \
+ -e "s,^build_os=.*,build_os=${_host_os}," \
+ ${PKGDESTDIR}/usr/bin/libtool
+ fi
fi
}
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PR PATCH] [Merged]: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (43 preceding siblings ...)
2022-11-17 17:56 ` oreo639
@ 2022-11-17 20:15 ` paper42
2022-11-17 21:28 ` dkwo
` (3 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: paper42 @ 2022-11-17 20:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1628 bytes --]
There's a merged pull request on the void-packages repository
libtool: update to 2.4.7.
https://github.com/void-linux/void-packages/pull/39313
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
Most of the build failures experienced were due to hardcoded version-mismatches and the libtool files not getting regenerated properly.
This also defines `lt_cv_shlibpath_overrides_runpath=yes` on musl since it always searches LD_LIBRARY_PATH before RPATH and RUNPATH and not defining it causes some tests to fail which verify this behavior.
Please test this PR before merging.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (44 preceding siblings ...)
2022-11-17 20:15 ` [PR PATCH] [Merged]: " paper42
@ 2022-11-17 21:28 ` dkwo
2022-11-17 23:20 ` oreo639
` (2 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: dkwo @ 2022-11-17 21:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 417 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1319227647
Comment:
it seems there's yet another cross-compilation issue with libtool:
if i use the packaged libtool to compile ntl, then it fails,
as previously reported, while if i natively compile libtool first,
then I can successfully use it to build ntl (on aarch64),
including passing tests.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (45 preceding siblings ...)
2022-11-17 21:28 ` dkwo
@ 2022-11-17 23:20 ` oreo639
2022-11-18 4:39 ` oreo639
2022-11-18 5:01 ` oreo639
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-17 23:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1319337416
Comment:
I can't build natively on aarch64.
Build the packages with `-C` and try running a diff between them and let me know what the difference is.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (46 preceding siblings ...)
2022-11-17 23:20 ` oreo639
@ 2022-11-18 4:39 ` oreo639
2022-11-18 5:01 ` oreo639
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-18 4:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1551 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1319534300
Comment:
Oh I see:
```
# The directories searched by this compiler when creating a shared library.
compiler_lib_search_dirs="/usr/lib/gcc/aarch64-linux-gnu/10.2.1 /usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/lib/../lib64 /usr/aarch64-linux-gnu/lib/../lib64 /usr/aarch64-linux-gnu/usr/lib/../lib64 /usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/lib /usr/aarch64-linux-gnu/lib /usr/aarch64-linux-gnu/usr/lib"
# Dependencies to place before and after the objects being linked to
# create a shared library.
predep_objects="/usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/lib/../lib64/crti.o /usr/lib/gcc/aarch64-linux-gnu/10.2.1/crtbeginS.o"
postdep_objects="/usr/lib/gcc/aarch64-linux-gnu/10.2.1/crtendS.o /usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/lib/../lib64/crtn.o"
predeps=""
postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path="-L/usr/lib/gcc/aarch64-linux-gnu/10.2.1 -L/usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/lib/../lib64 -L/usr/aarch64-linux-gnu/lib/../lib64 -L/usr/aarch64-linux-gnu/usr/lib/../lib64 -L/usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/lib -L/usr/aarch64-linux-gnu/lib -L/usr/aarch64-linux-gnu/usr/lib"
```
That's definitely not right.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: libtool: update to 2.4.7.
2022-09-16 11:29 [PR PATCH] Libtool oreo639
` (47 preceding siblings ...)
2022-11-18 4:39 ` oreo639
@ 2022-11-18 5:01 ` oreo639
48 siblings, 0 replies; 50+ messages in thread
From: oreo639 @ 2022-11-18 5:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1802 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39313#issuecomment-1319534300
Comment:
Oh I see:
```
# The directories searched by this compiler when creating a shared library.
compiler_lib_search_dirs="/usr/lib/gcc/aarch64-linux-gnu/10.2.1 /usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/lib/../lib64 /usr/aarch64-linux-gnu/lib/../lib64 /usr/aarch64-linux-gnu/usr/lib/../lib64 /usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/lib /usr/aarch64-linux-gnu/lib /usr/aarch64-linux-gnu/usr/lib"
# Dependencies to place before and after the objects being linked to
# create a shared library.
predep_objects="/usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/lib/../lib64/crti.o /usr/lib/gcc/aarch64-linux-gnu/10.2.1/crtbeginS.o"
postdep_objects="/usr/lib/gcc/aarch64-linux-gnu/10.2.1/crtendS.o /usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/lib/../lib64/crtn.o"
predeps=""
postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path="-L/usr/lib/gcc/aarch64-linux-gnu/10.2.1 -L/usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/lib/../lib64 -L/usr/aarch64-linux-gnu/lib/../lib64 -L/usr/aarch64-linux-gnu/usr/lib/../lib64 -L/usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/lib -L/usr/aarch64-linux-gnu/lib -L/usr/aarch64-linux-gnu/usr/lib"
```
That's definitely not right.
The cross compiler paths are supposed to have gotten wiped out here:
https://github.com/oreo639/void-packages/blob/b255a33115e72d753a90432950c3864be983606e/srcpkgs/libtool/template#L44-L46
But since these are relative paths, they leaked through.
^ permalink raw reply [flat|nested] 50+ messages in thread