From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] libtool: update to 2.4.7.
Date: Fri, 16 Sep 2022 14:16:05 +0200 [thread overview]
Message-ID: <20220916121605.kdzjkEIfqBm2r1n6GtqmFe6nnINCWE8NDmaK7zhJ6Tk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39313@inbox.vuxu.org>
[-- 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() {
next prev parent reply other threads:[~2022-09-16 12:16 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2022-09-16 12:34 ` oreo639
2022-09-16 12:35 ` oreo639
2022-09-16 13:04 ` oreo639
2022-09-16 14:28 ` oreo639
2022-09-16 14:31 ` oreo639
2022-09-16 14:45 ` oreo639
2022-09-16 14:57 ` oreo639
2022-09-16 17:38 ` [PR REVIEW] " paper42
2022-09-16 17:38 ` paper42
2022-09-16 17:50 ` dkwo
2022-09-16 22:40 ` [PR REVIEW] " oreo639
2022-09-16 22:40 ` oreo639
2022-09-16 22:42 ` oreo639
2022-09-16 22:43 ` oreo639
2022-09-16 22:43 ` [PR PATCH] [Updated] " oreo639
2022-10-05 18:02 ` dkwo
2022-10-10 13:56 ` dkwo
2022-11-16 14:18 ` dkwo
2022-11-16 17:23 ` oreo639
2022-11-16 17:24 ` oreo639
2022-11-16 17:26 ` oreo639
2022-11-16 17:28 ` [PR PATCH] [Updated] " oreo639
2022-11-16 17:32 ` oreo639
2022-11-16 17:33 ` oreo639
2022-11-16 17:35 ` oreo639
2022-11-16 20:53 ` oreo639
2022-11-16 20:57 ` oreo639
2022-11-16 21:04 ` oreo639
2022-11-16 21:26 ` [PR PATCH] [Updated] " oreo639
2022-11-16 21:29 ` oreo639
2022-11-16 21:58 ` [PR PATCH] [Updated] " oreo639
2022-11-16 23:36 ` oreo639
2022-11-16 23:45 ` oreo639
2022-11-16 23:58 ` oreo639
2022-11-17 0:24 ` oreo639
2022-11-17 0:31 ` oreo639
2022-11-17 0:40 ` oreo639
2022-11-17 1:53 ` oreo639
2022-11-17 17:46 ` oreo639
2022-11-17 17:56 ` oreo639
2022-11-17 20:15 ` [PR PATCH] [Merged]: " paper42
2022-11-17 21:28 ` dkwo
2022-11-17 23:20 ` oreo639
2022-11-18 4:39 ` oreo639
2022-11-18 5:01 ` oreo639
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220916121605.kdzjkEIfqBm2r1n6GtqmFe6nnINCWE8NDmaK7zhJ6Tk@z \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).