[packages/libtool] - updated to 2.4.7 - updated linking-order patch - removed obsolete fuse-ld patch
qboosh
qboosh at pld-linux.org
Fri Jun 24 06:27:27 CEST 2022
commit a535491a3b1c2e4da0f3b6f0e1738f82f79c7d19
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jun 24 06:28:57 2022 +0200
- updated to 2.4.7
- updated linking-order patch
- removed obsolete fuse-ld patch
libtool-fuse-ld.patch | 11 ------
libtool-linking-order.patch | 84 ++++++++++++++++++---------------------------
libtool.spec | 14 ++++----
3 files changed, 41 insertions(+), 68 deletions(-)
---
diff --git a/libtool.spec b/libtool.spec
index 9325f95..d62fd12 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -10,21 +10,20 @@ 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.6
-Release: 23
+Version: 2.4.7
+Release: 1
Epoch: 2
License: GPL v2+
Group: Development/Tools
Source0: http://ftp.gnu.org/gnu/libtool/%{name}-%{version}.tar.xz
-# Source0-md5: 1bfb9b923f2c1339b4d2ce1807064aa5
+# Source0-md5: 2fc0b6ddcd66a89ed6e45db28fa44232
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
# Source1-md5: b95e215961860c66f0868b0d551358c9
Patch0: %{name}-info.patch
Patch1: %{name}-libdirs.patch
Patch2: %{name}-multilib.patch
Patch3: %{name}-linking-order.patch
-Patch4: %{name}-fuse-ld.patch
-Patch5: %{name}-libx32.patch
+Patch4: %{name}-libx32.patch
URL: http://www.gnu.org/software/libtool/
BuildRequires: /usr/bin/which
BuildRequires: autoconf >= 2.62
@@ -80,7 +79,7 @@ Summary(pl.UTF-8): Biblioteka ogólnych wywołań dlopen
Summary(pt_BR.UTF-8): GNU libltdl, um wrapper dlopen para o GNU libtool
License: LGPL v2+
Group: Libraries
-Obsoletes: libtool-libs
+Obsoletes: libtool-libs < 1.4
%description -n libltdl
System independent dlopen wrapper for GNU libtool.
@@ -154,7 +153,8 @@ utilizando componentes estáticos (raramente necessário).
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
+
+%{__sed} -i -e '1s, /usr/bin/env sh,/bin/sh,' libtoolize.in
%build
%{__aclocal} -I m4
diff --git a/libtool-fuse-ld.patch b/libtool-fuse-ld.patch
deleted file mode 100644
index e8ea016..0000000
--- a/libtool-fuse-ld.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtool-2.4.3/build-aux/ltmain.in.orig 2014-10-27 18:20:51.000000000 +0100
-+++ libtool-2.4.3/build-aux/ltmain.in 2014-10-29 20:58:36.810592793 +0100
-@@ -5319,7 +5319,7 @@
- # -stdlib=* select c++ std lib with clang
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-+ -O*|-g*|-flto*|-fwhopr*|-fuse-ld|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
- func_quote_for_eval "$arg"
- arg=$func_quote_for_eval_result
- func_append compile_command " $arg"
diff --git a/libtool-linking-order.patch b/libtool-linking-order.patch
index a950214..12070b3 100644
--- a/libtool-linking-order.patch
+++ b/libtool-linking-order.patch
@@ -1,6 +1,6 @@
---- libtool-2.4.3/m4/libtool.m4.orig 2014-10-29 18:46:29.364258811 +0100
-+++ libtool-2.4.3/m4/libtool.m4 2014-10-29 20:55:40.250600202 +0100
-@@ -4957,7 +4957,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']
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
@@ -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
-@@ -4966,7 +4966,7 @@
+@@ -5174,7 +5174,7 @@ _LT_EOF
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -18,23 +18,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5040,13 +5040,13 @@
- *Sun\ F*) # Sun Fortran 8.3
- tmp_sharedflag='-G' ;;
- esac
-- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $compiler_flags $libobjs $deplibs $wl-soname $wl$soname -o $lib'
-
- if test yes = "$supports_anon_versioning"; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $compiler_flags $libobjs $deplibs $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
- fi
-
- case $cc_basename in
-@@ -5073,8 +5073,8 @@
+@@ -5313,8 +5313,8 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -45,7 +29,7 @@
fi
;;
-@@ -5092,8 +5092,8 @@
+@@ -5332,8 +5332,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -56,7 +40,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5121,8 +5121,8 @@
+@@ -5361,8 +5361,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 +51,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5139,8 +5139,8 @@
+@@ -5379,8 +5379,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -78,7 +62,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5272,12 +5272,12 @@
+@@ -5550,12 +5550,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 +77,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
-@@ -5376,7 +5376,7 @@
+@@ -5666,7 +5666,7 @@ _LT_EOF
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
@@ -102,16 +86,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.
-@@ -5417,7 +5417,7 @@
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
-- _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)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -5514,7 +5514,7 @@
+@@ -5804,7 +5804,7 @@ _LT_EOF
irix5* | irix6* | nonstopux*)
if test yes = "$GCC"; then
@@ -120,7 +95,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.
-@@ -5578,12 +5578,12 @@
+@@ -5845,7 +5845,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'
+ ;;
+ esac
+ ;;
+@@ -5878,12 +5878,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 +120,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
fi
else
-@@ -5634,9 +5634,9 @@
+@@ -5955,9 +5955,9 @@ _LT_EOF
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
if test yes = "$GCC"; then
wlarc='$wl'
@@ -148,7 +132,7 @@
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
-@@ -5647,9 +5647,9 @@
+@@ -5968,9 +5968,9 @@ _LT_EOF
;;
*)
wlarc='$wl'
@@ -160,7 +144,7 @@
;;
esac
fi
-@@ -6119,8 +6119,8 @@
+@@ -6444,8 +6444,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 +155,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-@@ -6146,7 +6146,7 @@
+@@ -6471,7 +6471,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,7 +164,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -6369,7 +6369,7 @@
+@@ -6741,7 +6741,7 @@ if test yes != "$_lt_caught_CXX_error";
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
@@ -189,7 +173,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
-@@ -6378,7 +6378,7 @@
+@@ -6750,7 +6750,7 @@ if test yes != "$_lt_caught_CXX_error";
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -198,7 +182,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -6592,8 +6592,8 @@
+@@ -6993,8 +6993,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 +193,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -6619,16 +6619,16 @@
+@@ -7020,16 +7020,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 +214,7 @@
;;
esac
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -6704,8 +6704,8 @@
+@@ -7105,8 +7105,8 @@ if test yes != "$_lt_caught_CXX_error";
*Sun\ C*)
# Sun C++ 5.9
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -241,7 +225,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
-@@ -6770,10 +6770,10 @@
+@@ -7171,10 +7171,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 +238,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
-@@ -6896,9 +6896,9 @@
+@@ -7297,9 +7297,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 +250,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -6933,9 +6933,9 @@
+@@ -7334,9 +7334,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 +262,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -6944,9 +6944,9 @@
+@@ -7345,9 +7345,9 @@ if test yes != "$_lt_caught_CXX_error";
else
# g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libtool.git/commitdiff/a535491a3b1c2e4da0f3b6f0e1738f82f79c7d19
More information about the pld-cvs-commit
mailing list