Compare commits

..

11 Commits

Author SHA1 Message Date
openeuler-ci-bot
a9b6af0ada
!30 [sync] PR-28: add sw_64 support
From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-03-04 08:13:30 +00:00
Hailiang
b896742c12 add sw_64 support
(cherry picked from commit 0bde29e267be1adccbd407aa71f4a4f3cbf29071)
2025-03-04 14:58:28 +08:00
Hailiang
e624215708 add sw_64 support
(cherry picked from commit cd4fd4e0475210d5c64a369dd2c0cff582360733)
2025-03-04 14:58:28 +08:00
openeuler-ci-bot
5363da0508
!20 riscv64: fortran编译选项增加-fPIC
From: @laokz 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2023-06-07 06:55:45 +00:00
laokz
daecd4d3b6
add -fPIC to fortran flags for riscv
Signed-off-by: misaka00251 <liuxin@iscas.ac.cn>
2023-06-06 03:52:27 +00:00
openeuler-ci-bot
dd434c86d4
!19 tests/link-order.at: avoid warning and test failure with GNU grep 3.8
From: @renxichen 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
2023-02-02 02:11:18 +00:00
renxichen
385dfa5c67 tests/link-order.at: avoid warning and test failure with GNU grep 3.8 2023-02-02 09:36:01 +08:00
openeuler-ci-bot
38ba51a877
!18 [sync] PR-17: upgrade version to 2.4.7
From: @renxichen 
Reviewed-by: @overweight 
Signed-off-by: @overweight
2022-11-04 07:16:33 +00:00
renxichen
e070ce380f upgrade version to 2.4.7 2022-11-04 14:37:52 +08:00
openeuler-ci-bot
4fb533ba0c
!12 update license from GFDL to GFDLv1.3+
From: @renxichen 
Reviewed-by: @licihua 
Signed-off-by: @licihua
2022-04-22 07:12:00 +00:00
rwx403335
8f5dd00b09 update license from GFDL to GFDLv1.3+ 2022-04-22 11:17:38 +08:00
8 changed files with 94 additions and 108 deletions

39
add-sw_64-support.patch Normal file
View File

@ -0,0 +1,39 @@
From 45efccd7042df956566914d686001eb42285461c Mon Sep 17 00:00:00 2001
From: mahailiang <mahailiang@uniontech.com>
Date: Mon, 4 Nov 2024 11:15:36 +0800
Subject: [PATCH] add sw_64 support
---
build-aux/config.guess | 3 +++
build-aux/config.sub | 1 +
2 files changed, 4 insertions(+)
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 7f76b62..84384ea 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1039,6 +1039,9 @@ EOF
loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
+ sw_64*:Linux:*:*)
+ echo $UNAME_MACHINE-unknown-linux-$LIBC
+ exit ;;
m32r*:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 9b62e37..70bc542 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1267,6 +1267,7 @@ case $cpu-$vendor in
| sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
| spu \
+ | sw_64 \
| tahoe \
| thumbv7* \
| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
--
2.20.1

View File

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

View File

@ -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, [[...]])

Binary file not shown.

BIN
libtool-2.4.7.tar.xz Normal file

Binary file not shown.

View File

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

View File

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

View File

@ -2,17 +2,16 @@
%global gcc_major 7.3.0
Name: libtool
Version: 2.4.6
Release: 34
License: GPLv2+ and LGPLv2+ and GFDL
Version: 2.4.7
Release: 4
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
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
Patch6000: backport-tests-link-order.at-avoid-warning-and-test-failure.patch
Patch6001: add-sw_64-support.patch
Requires: gcc(major),autoconf, automake, sed, tar, findutils
@ -61,6 +60,10 @@ export FCFLAGS=$(echo "$RPM_OPT_FLAGS -I/usr/lib64/gfortran/modules"| sed 's/-fs
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
@ -104,6 +107,21 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
%changelog
* Fri Feb 28 2025 mahailiang <mahailiang@uniontech.com> - 2.4.7-4
- add sw_64 support
* 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