From 1ea50f9fec2c0216ecdc29623b1186169fbc7cb2 Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Sun, 20 Oct 2024 13:02:36 +0000 Subject: automatic import of libtool --- .gitignore | 1 + ...k-order.at-avoid-warning-and-test-failure.patch | 31 ------------------- libtool-2.4.5-rpath.patch | 35 ---------------------- libtool-2.5.3-rpath.patch | 35 ++++++++++++++++++++++ libtool.spec | 33 +++++++++++++++----- sources | 2 +- 6 files changed, 63 insertions(+), 74 deletions(-) delete mode 100644 backport-tests-link-order.at-avoid-warning-and-test-failure.patch delete mode 100644 libtool-2.4.5-rpath.patch create mode 100644 libtool-2.5.3-rpath.patch diff --git a/.gitignore b/.gitignore index 38d50c9..703dbea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libtool-2.5.2.tar.xz /libtool-2.4.7.tar.xz +/libtool-2.5.3.tar.xz diff --git a/backport-tests-link-order.at-avoid-warning-and-test-failure.patch b/backport-tests-link-order.at-avoid-warning-and-test-failure.patch deleted file mode 100644 index 02efa32..0000000 --- a/backport-tests-link-order.at-avoid-warning-and-test-failure.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1e13a1944f725ccc24bce1a2fa6f9009ba8a2270 Mon Sep 17 00:00:00 2001 -From: Andreas Stieger -Date: Sun, 4 Sep 2022 22:24:41 +0200 -Subject: [PATCH] tests/link-order.at: avoid warning and test failure with GNU - grep 3.8 ---- - tests/link-order.at | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/link-order.at b/tests/link-order.at -index 3f01a00..a145347 100644 ---- a/tests/link-order.at -+++ b/tests/link-order.at -@@ -99,12 +99,12 @@ aix* | interix*) ;; # These systems have different path syntax - 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 --- -2.27.0 - diff --git a/libtool-2.4.5-rpath.patch b/libtool-2.4.5-rpath.patch deleted file mode 100644 index 2f97997..0000000 --- a/libtool-2.4.5-rpath.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f7e477ec085414991c8160c7394bfaf2b1425c67 Mon Sep 17 00:00:00 2001 -From: Karsten Hopp -Date: Wed, 29 Oct 2014 13:27:27 +0100 -Subject: [PATCH] remove /lib64 and /usr/lib64 rpath - ---- - m4/libtool.m4 | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/m4/libtool.m4 b/m4/libtool.m4 -index f796d7b..41dd20a 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -2866,6 +2866,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - # before this can be enabled. - hardcode_into_libs=yes - -+ # Add ABI-specific directories to the system library path. -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -+ - # Ideally, we could use ldconfig to report *all* directores which are - # searched for libraries, however this is still not possible. Aside from not - # being certain /sbin/ldconfig is available, command -@@ -2874,7 +2877,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - # appending ld.so.conf contents (and includes) to the search path. - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on --- -2.1.0 - diff --git a/libtool-2.5.3-rpath.patch b/libtool-2.5.3-rpath.patch new file mode 100644 index 0000000..e818351 --- /dev/null +++ b/libtool-2.5.3-rpath.patch @@ -0,0 +1,35 @@ +From f7e477ec085414991c8160c7394bfaf2b1425c67 Mon Sep 17 00:00:00 2001 +From: Karsten Hopp +Date: Wed, 29 Oct 2014 13:27:27 +0100 +Subject: [PATCH] remove /lib64 and /usr/lib64 rpath + +--- + m4/libtool.m4 | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/m4/libtool.m4 b/m4/libtool.m4 +index f796d7b..41dd20a 100644 +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -2930,6 +2930,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + # before this can be enabled. + hardcode_into_libs=yes + ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ + # Ideally, we could use ldconfig to report *all* directories which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command +@@ -2874,7 +2877,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + # appending ld.so.conf contents (and includes) to the search path. + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +-- +2.1.0 + diff --git a/libtool.spec b/libtool.spec index 90f4413..95c8119 100644 --- a/libtool.spec +++ b/libtool.spec @@ -2,16 +2,15 @@ %global gcc_major 7.3.0 Name: libtool -Version: 2.4.7 -Release: 4 +Version: 2.5.3 +Release: 1 License: GPL-2.0-or-later AND LGPL-2.0-or-later and GFDL-1.3-or-later Summary: The GNU Portable Library Tool URL: https://www.gnu.org/software/libtool/ Source0: https://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz -Patch0: libtool-2.4.5-rpath.patch +Patch0: libtool-2.5.3-rpath.patch Patch1: libtool-2.4.6-disable-lto-link-order2.patch -Patch6000: backport-tests-link-order.at-avoid-warning-and-test-failure.patch Requires: gcc(major),autoconf, automake, sed, tar, findutils @@ -98,8 +97,26 @@ rm -f %{buildroot}%{_infodir}/dir %files devel %license libltdl/COPYING.LIB %doc libltdl/README -%{_datadir}/libtool -%exclude %{_datadir}/libtool/build-aux +%{_datadir}/libtool/COPYING.LIB +%{_datadir}/libtool/Makefile.am +%{_datadir}/libtool/Makefile.in +%{_datadir}/libtool/README +%{_datadir}/libtool/aclocal.m4 +%{_datadir}/libtool/config-h.in +%{_datadir}/libtool/configure +%{_datadir}/libtool/configure.ac +%{_datadir}/libtool/libltdl +%{_datadir}/libtool/loaders +%{_datadir}/libtool/lt__alloc.c +%{_datadir}/libtool/lt__argz.c +%{_datadir}/libtool/lt__dirent.c +%{_datadir}/libtool/lt__strl.c +%{_datadir}/libtool/lt_dlloader.c +%{_datadir}/libtool/lt_error.c +%{_datadir}/libtool/ltdl.c +%{_datadir}/libtool/ltdl.h +%{_datadir}/libtool/ltdl.mk +%{_datadir}/libtool/slist.c %{_includedir}/ltdl.h %{_includedir}/libltdl %{_libdir}/libltdl.so @@ -110,8 +127,10 @@ rm -f %{buildroot}%{_infodir}/dir %{_mandir}/man1/libtool.1* %{_mandir}/man1/libtoolize.1* - %changelog +* Tue Oct 08 2024 Funda Wang - 2.5.3-1 +- update to 2.5.3 + * Thu Sep 26 2024 Funda Wang - 2.4.7-4 - pass -Wl,xxx options before libraries - disable LTO for link-order2 test diff --git a/sources b/sources index 970f378..8338507 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2fc0b6ddcd66a89ed6e45db28fa44232 libtool-2.4.7.tar.xz +e42b7d9ab875f1d013bba3cdb8a59b58 libtool-2.5.3.tar.xz -- cgit v1.2.3