!26 [sync] PR-22: pass -Wl,xxx options before libraries

From: @openeuler-sync-bot 
Reviewed-by: @gaoruoshu 
Signed-off-by: @gaoruoshu

backport-tests-link-order.at-avoid-warning-and-test-failure.patch

@@ -0,0 +1,31 @@
+From 1e13a1944f725ccc24bce1a2fa6f9009ba8a2270 Mon Sep 17 00:00:00 2001
+From: Andreas Stieger <Andreas.Stieger@gmx.de>
+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
+

libtool-2.4.6-am-1.16-test.patch

@@ -1,35 +0,0 @@
-Ensure that $(LIBLTDL) is built first
-
-After Automake upstream commit f4e91bfc490d, the list in 'all-am:' is
-reordered for this test-case (*_LTLIBRARIES is before *_PROGRAMS), which
-means that linker will fail to link 'old' binary.
-
-Previously (with automake <= 1.16), it was matter of luck -- it worked if
-(a) the build was serial (-j1), and/or (b) libtool-ltdl-devel package was
-installed on the box so ./configure picked the system version of libltdl.
-
-Users should anyways use system's ltdl, so this has low priority.
-
-diff --git a/tests/old-ltdl-iface.at b/tests/old-ltdl-iface.at
-index cee29089..6f9c8001 100644
---- a/tests/old-ltdl-iface.at
-+++ b/tests/old-ltdl-iface.at
-@@ -62,6 +62,9 @@ MOSTLYCLEANFILES =
- include ltdl/Makefile.inc
- bin_PROGRAMS = old
- old_LDADD = -Lltdl $(LIBLTDL)
-+# TODO: if --with-included-ltdl was unused this would
-+# generate useless dependency.
-+old_DEPENDENCIES = $(LIBLTDL)
- ]])
- 
- AT_DATA([old.c],
-@@ -131,7 +134,7 @@ LT_AT_CHECK_LIBTOOLIZE([--ltdl=ltdl --nonrecursive --install], 0, [expout], [exp
- 
- AT_CHECK([test -f ltdl/Makefile.inc])
- 
--LT_AT_BOOTSTRAP([ignore], [-I m4], [], [--add-missing], [--force])
-+LT_AT_BOOTSTRAP([ignore], [-I m4], [], [--add-missing], [--force], [--with-included-ltdl])
- 
- LT_AT_EXEC_CHECK([./old], 0, [[...]])
- 

libtool-2.4.6-disable-lto-link-order2.patch

@@ -0,0 +1,53 @@
+Enabling lto will result in failure during test phase, to be precise test 67 will cause it.
+Compiler flags for this test (and most likely for rest of them) are inherited from actual build phase.
+I'm not sure if this is expected.
+
+Most distribution disables this test. We try to keep it by stripping lto flags for it.
+
+Origin for this tests: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=391427
+
+--- a/tests/link-order2.at	2015-01-16 19:52:04.000000000 +0100
++++ b/tests/link-order2_new.at	2021-11-30 02:01:09.574451906 +0100
+@@ -47,6 +47,8 @@
+ AT_KEYWORDS([libtool])
+ AT_KEYWORDS([interactive])dnl running 'wrong' may cause a popup window.
+ 
++NO_LTO_CFLAGS=${CFLAGS/-flto*-ffat-lto-objects }
++
+ eval `$LIBTOOL --config | $EGREP '^(shlibpath_var|allow_undefined_flag)='`
+ 
+ undefined_setting=-no-undefined
+@@ -89,12 +91,12 @@
+ EOF
+ 
+ for file in a0 a1 b; do
+-  $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c $file.c
++  $LIBTOOL --mode=compile $CC $CPPFLAGS $NO_LTO_CFLAGS -c $file.c
+ done
+-$CC $CPPFLAGS $CFLAGS -c main.c
++$CC $CPPFLAGS $NO_LTO_CFLAGS -c main.c
+ 
+ # Build an old, installed library.
+-$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o liba0.la a0.lo -rpath $deflibdir
++$LIBTOOL --mode=link $CC $NO_LTO_CFLAGS $LDFLAGS $static -o liba0.la a0.lo -rpath $deflibdir
+ $LIBTOOL --mode=install cp liba0.la $deflibdir/liba0.la
+ $LIBTOOL --mode=clean rm -f liba0.la
+ 
+@@ -118,13 +120,13 @@
+     esac
+     test non-libtool,-static-libtool-libs = "$type_of_depdepl,$static" &&
+        static=-all-static
+-    $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o liba1.la a1.lo -rpath $libdir
+-    $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o libb.la b.lo liba1.la -rpath $libdir
+-    AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o main$EXEEXT main.$OBJEXT libb.la -la0],
++    $LIBTOOL --mode=link $CC $NO_LTO_CFLAGS $LDFLAGS $static -o liba1.la a1.lo -rpath $libdir
++    $LIBTOOL --mode=link $CC $NO_LTO_CFLAGS $LDFLAGS $static -o libb.la b.lo liba1.la -rpath $libdir
++    AT_CHECK([$LIBTOOL --mode=link $CC $NO_LTO_CFLAGS $LDFLAGS $static -o main$EXEEXT main.$OBJEXT libb.la -la0],
+ 	     [], [ignore], [ignore])
+     LT_AT_EXEC_CHECK([./main])
+     # Now test that if we reverse the link order, the program fails.
+-    AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o wrong$EXEEXT main.$OBJEXT -la0 libb.la],
++    AT_CHECK([$LIBTOOL --mode=link $CC $NO_LTO_CFLAGS $LDFLAGS $static -o wrong$EXEEXT main.$OBJEXT -la0 libb.la],
+ 	     [], [ignore], [ignore])
+     if test yes, != "$shared_fails,$static"; then
+       LT_AT_EXEC_CHECK([./wrong], [1], [], [ignore], [|| (exit 1)])

libtool-exit-verbosely-for-fatal-configure-problems.patch

@@ -1,31 +0,0 @@
-From 350082b6aa89f9ef603fcebbb4cf33f15a743f2f Mon Sep 17 00:00:00 2001
-From: Bert Wesarg <bert.wesarg@googlemail.com>
-Date: Mon, 13 Jun 2016 22:28:47 +0200
-Subject: [PATCH] libtool: exit verbosely for fatal configure problems
-
-Instead of calling not-existing function and processing subsequent
-shell code.
-
-* build-aux/ltmain.in (func_fatal_configuration): Fix typo in
-func_fatal_error call.
-
-Copyright-paperwork-exempt: Yes
----
- build-aux/ltmain.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 0ad021d..c3058f2 100644
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -212,7 +212,7 @@ fi
- # a configuration failure hint, and exit.
- func_fatal_configuration ()
- {
--    func__fatal_error ${1+"$@"} \
-+    func_fatal_error ${1+"$@"} \
-       "See the $PACKAGE documentation for more information." \
-       "Fatal configuration error."
- }
--- 
-1.8.3.1

libtool-fix-GCC-linking-with-specs.patch

@@ -1,36 +0,0 @@
-From 702a97fbb09bd7088a50f2b239016d1e32843c24 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Fri, 18 Sep 2015 10:36:43 +0200
-Subject: [PATCH] libtool: fix GCC linking with -specs=*
-
-References:
-https://bugzilla.redhat.com/show_bug.cgi?id=985592
-
-* build-aux/ltmain.in (func_mode_link): Pass -specs=*
-to the linker, Fedora uses this option for hardening.
-
-Signed-off-by: Pavel Raiskup <praiskup@redhat.com>
----
- build-aux/ltmain.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index d5cf07a..0c40da0 100644
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -5360,10 +5360,12 @@ func_mode_link ()
-       # -tp=*                Portland pgcc target processor selection
-       # --sysroot=*          for sysroot support
-       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-+      # -specs=*             GCC specs files
-       # -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-linker-plugin|-fstack-protector*|-stdlib=*| \
-+      -specs=*)
-         func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
-         func_append compile_command " $arg"
--- 
-1.8.3.1

libtool.spec

@@ -2,39 +2,43 @@
 %global  gcc_major  7.3.0
 
 Name:    libtool
-Version: 2.4.6
-Release: 30
-License: GPLv2+ and LGPLv2+ and GFDL
+Version: 2.4.7
+Release: 4
+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:     http://www.gnu.org/software/libtool/
-Source0:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz
+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
-Patch1:     libtool-2.4.6-am-1.16-test.patch
-Patch6000:  libtool-exit-verbosely-for-fatal-configure-problems.patch
-Patch6001:  libtool-fix-GCC-linking-with-specs.patch
+Patch0:  libtool-2.4.5-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
 
-BuildRequires: texinfo,autoconf, automake,help2man
-BuildRequires: libstdc++-devel, gcc-gfortran,gcc, gcc-c++
-
-
-Provides:  %{name}-ltdl
-Obsoletes: %{name}-ltdl
+BuildRequires: texinfo autoconf automake help2man
+BuildRequires: libstdc++-devel gcc-gfortran gcc gcc-c++
 
 %description
 GNU libtool is a generic library support script.
 Libtool hides the complexity of using shared libraries behind a consistent, portable interface.
 
+%package ltdl
+Summary: Runtime libraries for GNU Libtool Dynamic Module Loader
+Provides: %{name}-libs = %{version}-%{release}
+License: LGPL-2.1-or-later
+
+%description ltdl
+The libtool-ltdl package contains the GNU Libtool Dynamic Module Loader, a
+library that provides a consistent, portable interface which simplifies the
+process of using dynamic modules.
+
 %package   devel
 Summary:   Tools needed for development using the GNU Libtool Dynamic Module Loader
-License:   LGPLv2+
+License:   LGPL-2.0-or-later
 Requires:  automake
-Requires:  %{name} = %{version}-%{release}
-Provides:  %{name}-ltdl-devel
-Obsoletes: %{name}-ltdl-devel
-
+Requires:  %{name}-ltdl = %{version}-%{release}
+Provides:  %{name}-ltdl-devel = %{version}-%{release}
+Obsoletes: %{name}-ltdl-devel < %{version}-%{release}
 
 %description devel
 Static libraries and header files for development with ltdl.
@@ -43,40 +47,54 @@ Static libraries and header files for development with ltdl.
 
 %prep
 %autosetup -n libtool-%{version} -p1
-
-autoreconf -v
+# Fix libtool to pass -Wl,xxx options before libraries
+sed -i \
+   -e 's,$libobjs $deplibs $compiler_flags,$compiler_flags $libobjs $deplibs,' \
+   -e 's,$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags,$compiler_flags $predep_objects $libobjs $deplibs $postdep_objects,' \
+ m4/libtool.m4
 
 %build
+autoreconf -v
 export CC=gcc
 export CXX=g++
 export F77=gfortran
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export FFLAGS=$(echo "$RPM_OPT_FLAGS -I/usr/lib64/gfortran/modules"| sed 's/-fstack-protector-strong/ /g')
 export FCFLAGS=$(echo "$RPM_OPT_FLAGS -I/usr/lib64/gfortran/modules"| sed 's/-fstack-protector-strong/ /g')
+%ifarch x86_64
+export FFLAGS="$RPM_OPT_FLAGS -fPIE"
+export FCFLAGS="$RPM_OPT_FLAGS -fPIE"
+%endif
+%ifarch riscv64
+export FFLAGS="$RPM_OPT_FLAGS -fPIC"
+export FCFLAGS="$RPM_OPT_FLAGS -fPIC"
+%endif
 
 %configure
 
 %make_build CUSTOM_LTDL_CFLAGS="%_hardening_cflags" CUSTOM_LTDL_LDFLAGS="%_hardening_ldflags"
 
 %check
-make check VERBOSE=yes
+%make_build check VERBOSE=yes
 
 %install
 %make_install
+%delete_la_and_a
 rm -f %{buildroot}%{_infodir}/dir
-rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
 
 %files
 %license COPYING
-%license libltdl/COPYING.LIB
 %doc AUTHORS NEWS THANKS TODO ChangeLog*
 %{_bindir}/libtool
 %{_bindir}/libtoolize
-%{_libdir}/libltdl.so.*
 %{_datadir}/aclocal/*.m4
 %dir %{_datadir}/libtool
 %{_datadir}/libtool/build-aux
 
+%files ltdl
+%license libltdl/COPYING.LIB
+%{_libdir}/libltdl.so.*
+
 %files devel
 %license libltdl/COPYING.LIB
 %doc libltdl/README
@@ -88,12 +106,40 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
 
 %files help
 %doc README
-%{_infodir}/libtool.info*.gz
+%{_infodir}/libtool.info*
 %{_mandir}/man1/libtool.1*
 %{_mandir}/man1/libtoolize.1*
 
 
 %changelog
+* Thu Sep 26 2024 Funda Wang <fundawang@yeah.net> - 2.4.7-4
+- pass -Wl,xxx options before libraries
+- disable LTO for link-order2 test
+
+* Tue Jun 06 2023 laokz <zhangkai@iscas.ac.cn> - 2.4.7-3
+- add -fPIC to fortran flags for riscv
+
+*Thu Feb 02 2023 renhongxun <renhongxun@h-partners.com> - 2.4.7-2
+- backport: tests/link-order.at: avoid warning and test failure with GNU grep 3.8
+
+* Thu Nov 03 2022 renhongxun <renhongxun@h-partners.com> - 2.4.7-1
+- upgrade version to 2.4.7
+
+* Tue Apr 26 2022 renhongxun <renhongxun@h-partners.com> - 2.4.6-35
+- udpate license from GFDL to GFDL-1.3-or-later
+
+* Fri Jul 23 2021 yuanxin <yuanxin24@huawei.com> - 2.4.6-34
+- remove BuildRequires gdb
+
+* Thu Aug 20 2020 tianwei <tianwei12@huawei.com> - 2.4.6-33
+- fixbug testcase fail for gfortan
+
+* Thu Mar 19 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.4.6-32
+- add necessary BuildRequires
+
+* Mon Jan 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.4.6-31
+- fixbug in wrong dependency of kernel-devel
+
 * Wed Jan 8 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.4.6-30
 - format patches
 

libtool.yaml

@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://git.savannah.gnu.org/git/libtool.git 
+tag_prefix: ^v 
+separator: .