commit d606da76f8b3d9b36b69e6075e73cb6c4e411c7a
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Sat Jan 18 17:28:37 2025 +0100
- updated to 2.5.4 (stable)
...tests-Fix-grep-warning-about-stray-before.patch | 35 -------------
libtool-linking-order.patch | 60 +++++++++++-----------
libtool-multilib.patch | 8 +--
libtool.spec | 24 ++++-----
4 files changed, 45 insertions(+), 82 deletions(-)
---
diff --git a/libtool.spec b/libtool.spec
index 56fc25a..34aaa94 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -1,6 +1,6 @@
#
# Conditional build:
-%bcond_without tests # "make check"
+%bcond_without tests # unit tests
%bcond_without tests_expensive # expensive tests
Summary: GNU libtool, a shared library generation tool
@@ -10,13 +10,13 @@ Summary(pt_BR.UTF-8): GNU libtool, uma ferramenta de
geração de bibliotecas co
Summary(ru.UTF-8): GNU libtool, набор утилит для генерации разделяемых
библиотек
Summary(uk.UTF-8): GNU libtool, набір утиліт для генерації динамічних
бібліотек
Name: libtool
-Version: 2.4.7
-Release: 10
+Version: 2.5.4
+Release: 1
Epoch: 2
License: GPL v2+
Group: Development/Tools
-Source0: http://ftp.gnu.org/gnu/libtool/%{name}-%{version}.tar.xz
-# Source0-md5: 2fc0b6ddcd66a89ed6e45db28fa44232
+Source0: https://ftp.gnu.org/gnu/libtool/%{name}-%{version}.tar.xz
+# Source0-md5: 22e0a29df8af5fdde276ea3a7d351d30
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
# Source1-md5: b95e215961860c66f0868b0d551358c9
Patch0: %{name}-info.patch
@@ -24,10 +24,9 @@ Patch1: %{name}-libdirs.patch
Patch2: %{name}-multilib.patch
Patch3: %{name}-linking-order.patch
Patch4: %{name}-libx32.patch
-Patch5: 0001-tests-Fix-grep-warning-about-stray-before.patch
URL: http://www.gnu.org/software/libtool/
BuildRequires: /usr/bin/which
-BuildRequires: autoconf >= 2.62
+BuildRequires: autoconf >= 2.64
BuildRequires: automake >= 1:1.11.1
BuildRequires: help2man
BuildRequires: libstdc++-devel >= 5:3.3.3
@@ -149,12 +148,11 @@ utilizando componentes estáticos (raramente necessário).
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
%{__sed} -i -e '1s, /usr/bin/env sh,/bin/sh,' libtoolize.in
build-aux/ltmain.{in,sh}
diff --git a/0001-tests-Fix-grep-warning-about-stray-before.patch
b/0001-tests-Fix-grep-warning-about-stray-before.patch
deleted file mode 100644
index 481dd42..0000000
--- a/0001-tests-Fix-grep-warning-about-stray-before.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 414deacee0f564afdf2d7750450274c581330a59 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fbe...@redhat.com>
-Date: Wed, 21 Dec 2022 13:14:03 +0100
-Subject: [PATCH] tests: Fix grep warning about stray \ before /
-
-Recent version of grep emit a warning if stray \ is found before /.
-This leads to the link-order test failure.
-
- * tests/link-order.at: Remove unneeded \ before /
----
- 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 3f01a00d..a145347f 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.38.1
-
diff --git a/libtool-linking-order.patch b/libtool-linking-order.patch
index ff2756f..f5b8589 100644
--- a/libtool-linking-order.patch
+++ b/libtool-linking-order.patch
@@ -1,7 +1,7 @@
---- libtool-2.4.7/m4/libtool.m4.orig 2022-06-23 20:14:57.604892363 +0200
-+++ libtool-2.4.7/m4/libtool.m4 2022-06-23 21:31:31.253339766 +0200
-@@ -5165,7 +5165,7 @@ _LT_EOF
- _LT_TAGVAR(exclude_expsyms,
$1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+--- libtool-2.5.4/m4/libtool.m4.orig 2025-01-17 18:00:01.715242923 +0100
++++ libtool-2.5.4/m4/libtool.m4 2025-01-17 22:24:02.159427871 +0100
+@@ -5299,7 +5299,7 @@ _LT_EOF
+ _LT_TAGVAR(file_list_spec, $1)='@'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker
--out-implib -Xlinker $lib'
@@ -9,7 +9,7 @@
# If the export-symbols file already is a .def file, use it as
# is; otherwise, prepend EXPORTS...
_LT_TAGVAR(archive_expsym_cmds, $1)='if
_LT_DLL_DEF_P([$export_symbols]); then
-@@ -5174,7 +5174,7 @@ _LT_EOF
+@@ -5308,7 +5308,7 @@ _LT_EOF
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -18,7 +18,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5277,13 +5280,13 @@ _LT_EOF
+@@ -5411,13 +5411,13 @@ _LT_EOF
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
@@ -34,7 +34,7 @@
fi
case $cc_basename in
-@@ -5313,8 +5313,8 @@ _LT_EOF
+@@ -5453,8 +5453,8 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs
$linker_flags -o $lib'
wlarc=
else
@@ -45,7 +45,7 @@
fi
;;
-@@ -5332,8 +5332,8 @@ _LT_EOF
+@@ -5472,8 +5472,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null;
then
@@ -56,7 +56,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5361,8 +5361,8 @@ _LT_EOF
+@@ -5501,8 +5501,8 @@ _LT_EOF
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null;
then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
@@ -67,7 +67,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5379,8 +5379,8 @@ _LT_EOF
+@@ -5519,8 +5519,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null;
then
@@ -78,7 +78,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5550,12 +5550,12 @@ _LT_EOF
+@@ -5690,12 +5690,12 @@ _LT_EOF
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
_LT_TAGVAR(hardcode_libdir_flag_spec,
$1)='$wl-blibpath:$libdir:'"$aix_libpath"
@@ -93,7 +93,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
-@@ -5666,7 +5666,7 @@ _LT_EOF
+@@ -5806,7 +5806,7 @@ _LT_EOF
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
@@ -102,7 +102,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -5804,7 +5804,7 @@ _LT_EOF
+@@ -5944,7 +5944,7 @@ _LT_EOF
irix5* | irix6* | nonstopux*)
if test yes = "$GCC"; then
@@ -111,16 +111,16 @@
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
-@@ -5845,7 +5845,7 @@ _LT_EOF
+@@ -5985,7 +5985,7 @@ _LT_EOF
tcc*)
# Fabrice Bellard et al's Tiny C Compiler
_LT_TAGVAR(ld_shlibs, $1)=yes
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs
$deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib
$compiler_flags $libobjs $deplibs'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
;;
esac
- ;;
-@@ -5878,12 +5878,12 @@ _LT_EOF
+@@ -6022,12 +6022,12 @@ _LT_EOF
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
@@ -136,7 +136,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
fi
else
-@@ -5955,9 +5955,9 @@ _LT_EOF
+@@ -6102,9 +6102,9 @@ _LT_EOF
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
if test yes = "$GCC"; then
wlarc='$wl'
@@ -148,7 +148,7 @@
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
-@@ -5968,9 +5968,9 @@ _LT_EOF
+@@ -6115,9 +6115,9 @@ _LT_EOF
;;
*)
wlarc='$wl'
@@ -160,7 +160,7 @@
;;
esac
fi
-@@ -6444,8 +6444,8 @@ if test yes != "$_lt_caught_CXX_error";
+@@ -6591,8 +6591,8 @@ if test yes != "$_lt_caught_CXX_error";
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test yes = "$with_gnu_ld"; then
@@ -171,7 +171,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-@@ -6471,7 +6471,7 @@ if test yes != "$_lt_caught_CXX_error";
+@@ -6617,7 +6617,7 @@ if test yes != "$_lt_caught_CXX_error";
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -180,8 +180,8 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -6741,7 +6741,7 @@ if test yes != "$_lt_caught_CXX_error";
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+@@ -6888,7 +6888,7 @@ if test yes != "$_lt_caught_CXX_error";
+ _LT_TAGVAR(file_list_spec, $1)='@'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname
$wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -189,7 +189,7 @@
# If the export-symbols file already is a .def file, use it as
# is; otherwise, prepend EXPORTS...
_LT_TAGVAR(archive_expsym_cmds, $1)='if
_LT_DLL_DEF_P([$export_symbols]); then
-@@ -6750,7 +6750,7 @@ if test yes != "$_lt_caught_CXX_error";
+@@ -6897,7 +6897,7 @@ if test yes != "$_lt_caught_CXX_error";
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -198,7 +198,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -6993,8 +6993,8 @@ if test yes != "$_lt_caught_CXX_error";
+@@ -7140,8 +7140,8 @@ if test yes != "$_lt_caught_CXX_error";
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -209,7 +209,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -7020,16 +7020,16 @@ if test yes != "$_lt_caught_CXX_error";
+@@ -7167,16 +7167,16 @@ if test yes != "$_lt_caught_CXX_error";
# earlier do not add the objects themselves.
case `$CC -V 2>&1` in
*"Version 7."*)
@@ -230,7 +230,7 @@
;;
esac
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -7105,8 +7105,8 @@ if test yes != "$_lt_caught_CXX_error";
+@@ -7252,8 +7252,8 @@ if test yes != "$_lt_caught_CXX_error";
*Sun\ C*)
# Sun C++ 5.9
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -241,7 +241,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(whole_archive_flag_spec,
$1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test
-z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all
\"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
-@@ -7171,10 +7171,10 @@ if test yes != "$_lt_caught_CXX_error";
+@@ -7322,10 +7322,10 @@ if test yes != "$_lt_caught_CXX_error";
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -254,7 +254,7 @@
_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
_LT_TAGVAR(whole_archive_flag_spec,
$1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
fi
-@@ -7297,9 +7297,9 @@ if test yes != "$_lt_caught_CXX_error";
+@@ -7451,9 +7451,9 @@ if test yes != "$_lt_caught_CXX_error";
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -266,7 +266,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -7334,9 +7334,9 @@ if test yes != "$_lt_caught_CXX_error";
+@@ -7488,9 +7488,9 @@ if test yes != "$_lt_caught_CXX_error";
if test yes,no = "$GXX,$with_gnu_ld"; then
_LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -278,7 +278,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -7345,9 +7345,9 @@ if test yes != "$_lt_caught_CXX_error";
+@@ -7499,9 +7499,9 @@ if test yes != "$_lt_caught_CXX_error";
else
# g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
diff --git a/libtool-multilib.patch b/libtool-multilib.patch
index ce4dc46..ea56f8e 100644
--- a/libtool-multilib.patch
+++ b/libtool-multilib.patch
@@ -1,6 +1,6 @@
---- libtool-2.4.3/m4/libtool.m4.multilib 2003-01-04 22:22:16.000000000
+0100
-+++ libtool-2.4.3/m4/libtool.m4 2003-01-04 22:25:15.000000000 +0100
-@@ -2190,6 +2190,26 @@
+--- libtool-2.5.4/m4/libtool.m4.orig 2025-01-17 17:53:01.230854216 +0100
++++ libtool-2.5.4/m4/libtool.m4 2025-01-17 17:59:44.392003438 +0100
+@@ -2979,6 +2979,26 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
dynamic_linker='GNU/Linux ld.so'
@@ -26,4 +26,4 @@
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff}
/usr/local/lib${libsuff}"
;;
- netbsd*)
+ netbsdelf*-gnu)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libtool.git/commitdiff/d606da76f8b3d9b36b69e6075e73cb6c4e411c7a
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
