开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 4

_service:extract_file:libtool.spec Changed

@@ -3,15 +3,14 @@
 
 Name:    libtool
 Version: 2.4.7
-Release: 1
-License: GPLv2+ and LGPLv2+ and GFDL
+Release: 3
+License: GPLv2+ and LGPLv2+ 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
 
-%ifarch riscv64
-Patch0:     fix-testsuite.patch
-%endif
+Patch0:     libtool-2.4.5-rpath.patch
+Patch6000:	backport-tests-link-order.at-avoid-warning-and-test-failure.patch
 
 Requires: gcc(major),autoconf, automake, sed, tar, findutils
 
@@ -60,6 +59,10 @@
 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
 
@@ -103,9 +106,17 @@
 
 
 %changelog
-* Tue Mar 29 2022 misaka00251 <misaka00251@misakanet.cn> - 2.4.7-1
-- Upgrade package version
-- Fixed test suite for riscv64.
+* 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

_service:extract_file:backport-tests-link-order.at-avoid-warning-and-test-failure.patch Added

@@ -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
+

_service:extract_file:fix-testsuite.patch Deleted

@@ -1,216 +0,0 @@
-diff --git a/tests/cmdline_wrap.at b/tests/cmdline_wrap.at
-index 53eadf1..e600b14 100644
---- a/tests/cmdline_wrap.at
-+++ b/tests/cmdline_wrap.at
-@@ -46,6 +46,6 @@ cd tests
- INNER_TESTSUITEFLAGS="$INNER_TESTSUITEFLAGS abs_top_srcdir=$abs_top_srcdir \
-   abs_builddir=$abs_builddir"
- AT_CHECK($CONFIG_SHELL $abs_srcdir/testsuite -k libtool$INNER_TESTSUITEFLAGS,
--	 , ignore, ignore)
-+	 1, ignore, ignore)
- 
- AT_CLEANUP
-diff --git a/tests/f77demo.at b/tests/f77demo.at
-index 7b1ba4d..1fd126e 100644
---- a/tests/f77demo.at
-+++ b/tests/f77demo.at
-@@ -65,15 +65,24 @@ lib_LTLIBRARIES = libfoo.la libmix.la libfoo2.la libfoo3.la
- libfoo_la_SOURCES = foof.f
- libfoo_la_LIBADD = libfoo2.la
- libfoo_la_LDFLAGS = -no-undefined
-+libfoo_la_FFLAGS = -fPIC
-+libfoo_la_FCFLAGS = -fPIC
- 
- libfoo2_la_SOURCES = foof2.f
- libfoo2_la_LDFLAGS = -no-undefined
-+libfoo2_la_FFLAGS = -fPIC
-+libfoo2_la_FCFLAGS = -fPIC
- 
- libfoo3_la_SOURCES = foof3.f
- libfoo3_la_LDFLAGS = -no-undefined
-+libfoo3_la_FFLAGS = -fPIC
-+libfoo3_la_FCFLAGS = -fPIC
- 
- libmix_la_SOURCES = foof.f foof2.f fooc.c
- libmix_la_LDFLAGS = -no-undefined
-+libmix_la_FCLAGS = -fPIC
-+libmix_la_FFLAGS = -fPIC
-+libmix_la_CFLAGS = -fPIC
- 
- noinst_HEADERS = foo.h
- 
-@@ -81,9 +90,14 @@ bin_PROGRAMS = fprogram cprogram
- 
- fprogram_SOURCES = fprogram.f
- fprogram_LDADD = libfoo.la libfoo3.la
-+fprogram_FFLAGS = -fPIC
-+fprogram_FCFLAGS = -fPIC
- 
- cprogram_SOURCES = cprogram.c
- cprogram_LDADD = libmix.la $(FLIBS)
-+cprogram_CFLAGS = -fPIC
-+cprogram_FFLAGS = -fPIC
-+cprogram_FCFLAGS = -fPIC
- 
- libtool: $(LIBTOOL_DEPS)
- 	$(SHELL) ./config.status --recheck
-diff --git a/tests/fcdemo.at b/tests/fcdemo.at
-index ef05d94..c466138 100644
---- a/tests/fcdemo.at
-+++ b/tests/fcdemo.at
-@@ -69,15 +69,24 @@ lib_LTLIBRARIES = libfoo.la libmix.la libfoo2.la libfoo3.la
- libfoo_la_SOURCES = foof.f90
- libfoo_la_LIBADD = libfoo2.la
- libfoo_la_LDFLAGS = -no-undefined
-+libfoo_la_FFLAGS = -fPIC
-+libfoo_la_FCFLAGS = -fPIC
- 
- libfoo2_la_SOURCES = foof2.f90
- libfoo2_la_LDFLAGS = -no-undefined
-+libfoo2_la_FFLAGS = -fPIC
-+libfoo2_la_FCFLAGS = -fPIC
- 
- libfoo3_la_SOURCES = foof3.f90
- libfoo3_la_LDFLAGS = -no-undefined
-+libfoo3_la_FFLAGS = -fPIC
-+libfoo3_la_FCFLAGS = -fPIC
- 
- libmix_la_SOURCES = foof.f90 foof2.f90 fooc.c
- libmix_la_LDFLAGS = -no-undefined
-+libmix_la_FCLAGS = -fPIC
-+libmix_la_FFLAGS = -fPIC
-+libmix_la_CFLAGS = -fPIC
- 
- noinst_HEADERS = foo.h
- 
-@@ -85,22 +94,27 @@ bin_PROGRAMS = fprogram cprogram
- 
- fprogram_SOURCES = fprogram.f90
- fprogram_LDADD = libfoo.la libfoo3.la
-+fprogram_FFLAGS = -fPIC
-+fprogram_FCFLAGS = -fPIC
- 
- cprogram_SOURCES = cprogram.c
- cprogram_LDADD = libmix.la $(FCLIBS)
-+cprogram_CFLAGS = -fPIC
-+cprogram_FFLAGS = -fPIC
-+cprogram_FCFLAGS = -fPIC
- 
- libtool: $(LIBTOOL_DEPS)
- 	$(SHELL) ./config.status --recheck
- 
- # Work around Automake bug, where FCFLAGS_f90 is not provided:
- .f90.o:
--	$(FCCOMPILE) -c -o @S|@@ $(FCFLAGS_f90) $<
-+	$(FCCOMPILE) -fPIC -c -o @S|@@ $(FCFLAGS_f90) $<
- 
- .f90.obj:
--	$(FCCOMPILE) -c -o @S|@@ $(FCFLAGS_f90) `$(CYGPATH_W) '$<'`
-+	$(FCCOMPILE) -fPIC -c -o @S|@@ $(FCFLAGS_f90) `$(CYGPATH_W) '$<'`
- 
- .f90.lo:
--	$(LTFCCOMPILE) -c -o @S|@@ $(FCFLAGS_f90) $<
-+	$(LTFCCOMPILE) -fPIC -c -o @S|@@ $(FCFLAGS_f90) $<
- )
- 
- AT_DATA(fprogram.f90,
-diff --git a/tests/testsuite b/tests/testsuite
-index 24265e4..8b297c8 100755
---- a/tests/testsuite
-+++ b/tests/testsuite
-@@ -44264,15 +44264,24 @@ lib_LTLIBRARIES = libfoo.la libmix.la libfoo2.la libfoo3.la
- libfoo_la_SOURCES = foof.f
- libfoo_la_LIBADD = libfoo2.la
- libfoo_la_LDFLAGS = -no-undefined
-+libfoo_la_FFLAGS = -fPIC
-+libfoo_la_FCFLAGS = -fPIC
- 
- libfoo2_la_SOURCES = foof2.f
- libfoo2_la_LDFLAGS = -no-undefined
-+libfoo2_la_FFLAGS = -fPIC
-+libfoo2_la_FCFLAGS = -fPIC
- 
- libfoo3_la_SOURCES = foof3.f
- libfoo3_la_LDFLAGS = -no-undefined
-+libfoo3_la_FFLAGS = -fPIC
-+libfoo3_la_FCFLAGS = -fPIC
- 
- libmix_la_SOURCES = foof.f foof2.f fooc.c
- libmix_la_LDFLAGS = -no-undefined
-+libmix_la_FCLAGS = -fPIC
-+libmix_la_FFLAGS = -fPIC
-+libmix_la_CFLAGS = -fPIC
- 
- noinst_HEADERS = foo.h
- 
-@@ -44280,9 +44289,14 @@ bin_PROGRAMS = fprogram cprogram
- 
- fprogram_SOURCES = fprogram.f
- fprogram_LDADD = libfoo.la libfoo3.la
-+fprogram_FFLAGS = -fPIC
-+fprogram_FCFLAGS = -fPIC
- 
- cprogram_SOURCES = cprogram.c
- cprogram_LDADD = libmix.la $(FLIBS)
-+cprogram_CFLAGS = -fPIC
-+cprogram_FFLAGS = -fPIC
-+cprogram_FCFLAGS = -fPIC
- 
- libtool: $(LIBTOOL_DEPS)
- 	$(SHELL) ./config.status --recheck
-@@ -45875,15 +45889,24 @@ lib_LTLIBRARIES = libfoo.la libmix.la libfoo2.la libfoo3.la
- libfoo_la_SOURCES = foof.f90
- libfoo_la_LIBADD = libfoo2.la
- libfoo_la_LDFLAGS = -no-undefined
-+libfoo_la_FFLAGS = -fPIC
-+libfoo_la_FCFLAGS = -fPIC
- 
- libfoo2_la_SOURCES = foof2.f90
- libfoo2_la_LDFLAGS = -no-undefined
-+libfoo2_la_FFLAGS = -fPIC
-+libfoo2_la_FCFLAGS = -fPIC
- 
- libfoo3_la_SOURCES = foof3.f90
- libfoo3_la_LDFLAGS = -no-undefined
-+libfoo3_la_FFLAGS = -fPIC
-+libfoo3_la_FCFLAGS = -fPIC
- 
- libmix_la_SOURCES = foof.f90 foof2.f90 fooc.c
- libmix_la_LDFLAGS = -no-undefined
-+libmix_la_FCLAGS = -fPIC
-+libmix_la_FFLAGS = -fPIC
-+libmix_la_CFLAGS = -fPIC
- 
- noinst_HEADERS = foo.h
- 
-@@ -45891,22 +45914,27 @@ bin_PROGRAMS = fprogram cprogram
- 
- fprogram_SOURCES = fprogram.f90
- fprogram_LDADD = libfoo.la libfoo3.la
-+fprogram_FFLAGS = -fPIC
-+fprogram_FCFLAGS = -fPIC
- 
- cprogram_SOURCES = cprogram.c
- cprogram_LDADD = libmix.la $(FCLIBS)
-+cprogram_CFLAGS = -fPIC
-+cprogram_FFLAGS = -fPIC
-+cprogram_FCFLAGS = -fPIC
- 
- libtool: $(LIBTOOL_DEPS)

_service:extract_file:libtool-2.4.5-rpath.patch Added

@@ -0,0 +1,35 @@
+From f7e477ec085414991c8160c7394bfaf2b1425c67 Mon Sep 17 00:00:00 2001
+From: Karsten Hopp <karsten@fedoraproject.org>
+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
+

_service Changed

_service:tar_scm:libtool-1648563191.ae08b69.tar Deleted

_service:tar_scm:libtool-1686120945.5363da0.tar Added