Compare commits

...

4 Commits

Author SHA1 Message Date
openeuler-ci-bot 095de3e893 !35 fix building packages without libltdl.la
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-05-20 04:02:33 +00:00
Funda Wang c15ca66992 fix building packages without libltdl.la 2025-04-04 20:04:44 +08:00
openeuler-ci-bot 55bdc169d5 !33 [sync] PR-31: add sw_64 support
From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-03-17 04:23:51 +00:00
Hailiang 5c8bc2ff61 add sw_64 support
(cherry picked from commit cc2c5df69d)
2025-03-17 10:59:04 +08:00
3 changed files with 65 additions and 1 deletions
+39
View File
@@ -0,0 +1,39 @@
From 80ff97af5d5686e071816af16f65d98af5116238 Mon Sep 17 00:00:00 2001
From: Hailiang <mahailiang@uniontech.com>
Date: Tue, 11 Mar 2025 13:43:07 +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 48a6846..a5fa853 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1186,6 +1186,9 @@ EOF
sparc:Linux:*:* | sparc64:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
+ sw_64*:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
tile*:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 4aaae46..ada8a42 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1432,6 +1432,7 @@ case $cpu-$vendor in
| spu \
| sv1 \
| sx* \
+ | sw_64 \
| tahoe \
| thumbv7* \
| tic30 \
--
2.20.1
@@ -0,0 +1,17 @@
diff -up ./m4/ltdl.m4.orig ./m4/ltdl.m4
--- ./m4/ltdl.m4.orig 2016-02-11 20:40:28.013253981 +0200
+++ ./m4/ltdl.m4 2016-02-11 20:41:07.142760471 +0200
@@ -282,8 +282,11 @@ AC_ARG_WITH([ltdl_lib],
[use the libltdl.la installed in DIR])])
if test -n "$with_ltdl_lib"; then
- if test -f "$with_ltdl_lib/libltdl.la"; then :
- else
+ # check for the existence of "$with_ltdl_lib/libltdl.la" while
+ # allowing people to delete the libtool archive file (which isn't
+ # useful in this case in many common platforms.)
+ with_ltdl_lib_libname=`echo "$with_ltdl_lib"/libltdl.*`
+ if test "x$with_ltdl_lib_libname" = "x$with_ltdl_lib/libltdl.*"; then
AC_MSG_ERROR([invalid ltdl library directory: '$with_ltdl_lib'])
fi
else
+9 -1
View File
@@ -3,7 +3,7 @@
Name: libtool
Version: 2.5.4
Release: 1
Release: 3
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: https://www.gnu.org/software/libtool/
@@ -11,6 +11,8 @@ Source0: https://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz
Patch0: libtool-2.5.3-rpath.patch
Patch1: libtool-2.4.6-disable-lto-link-order2.patch
Patch2: add-sw_64-support.patch
Patch3: libtool-2.4.6-fix-building-without-libltdl.la.patch
Requires: gcc(major),autoconf, automake, sed, tar, findutils
@@ -128,6 +130,12 @@ rm -f %{buildroot}%{_infodir}/dir
%{_mandir}/man1/libtoolize.1*
%changelog
* Fri Apr 04 2025 Funda Wang <fundawang@yeah.net> - 2.5.4-3
- fix building packages without libltdl.la
* Tue Mar 11 2025 mahailiang <mahailiang@uniontech.com> - 2.5.4-2
- add sw_64 support
* Thu Nov 21 2024 Funda Wang <fundawang@yeah.net> - 2.5.4-1
- update to 2.5.4