!40 [sync] PR-39: Fix build error for loongarch64
From: @openeuler-sync-bot Reviewed-by: @HuaxinLuGitee Signed-off-by: @HuaxinLuGitee
This commit is contained in:
commit
2b197b4387
@ -1,35 +0,0 @@
|
|||||||
From 4756f6073be004be96f26cac2c557bf3af9323f7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Wenlong Zhang <zhangwenlong@loongson.cn>
|
|
||||||
Date: Fri, 23 Sep 2022 11:16:27 +0800
|
|
||||||
Subject: [PATCH] add loongarch support
|
|
||||||
|
|
||||||
---
|
|
||||||
lib/libcrypt.map.in | 2 +-
|
|
||||||
lib/libcrypt.minver | 1 +
|
|
||||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/lib/libcrypt.map.in b/lib/libcrypt.map.in
|
|
||||||
index e746a1b..a9059ac 100644
|
|
||||||
--- a/lib/libcrypt.map.in
|
|
||||||
+++ b/lib/libcrypt.map.in
|
|
||||||
@@ -42,5 +42,5 @@ fcrypt - GLIBC_2.0
|
|
||||||
# libcrypt.minver. The ordering is left to right, top to bottom.
|
|
||||||
%chain GLIBC_2.0 GLIBC_2.2 GLIBC_2.2.1 GLIBC_2.2.2 GLIBC_2.2.5 GLIBC_2.2.6
|
|
||||||
%chain GLIBC_2.3 GLIBC_2.4 GLIBC_2.12 GLIBC_2.16 GLIBC_2.17 GLIBC_2.18
|
|
||||||
-%chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33
|
|
||||||
+%chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33 GLIBC_2.34
|
|
||||||
%chain OW_CRYPT_1.0 XCRYPT_2.0 XCRYPT_4.3 XCRYPT_4.4
|
|
||||||
diff --git a/lib/libcrypt.minver b/lib/libcrypt.minver
|
|
||||||
index 445b946..b9099b6 100644
|
|
||||||
--- a/lib/libcrypt.minver
|
|
||||||
+++ b/lib/libcrypt.minver
|
|
||||||
@@ -87,6 +87,7 @@ GLIBC_2.0 linux.*gnu s390
|
|
||||||
GLIBC_2.0 linux.*gnu sh
|
|
||||||
GLIBC_2.0 linux.*gnu sparc
|
|
||||||
GLIBC_2.0 linux.*gnu x86_64
|
|
||||||
+GLIBC_2.34 linux.*gnu loongarch64
|
|
||||||
ERROR linux.*gnu .
|
|
||||||
|
|
||||||
# Other systems.
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
37
add-loongarch-support-for-libxcrypt.patch
Normal file
37
add-loongarch-support-for-libxcrypt.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From 81a7703ef861bb049fb36af00ec73d862e6314a9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Wenlong Zhang <zhangwenlong@loongson.cn>
|
||||||
|
Date: Thu, 7 Mar 2024 02:22:07 +0000
|
||||||
|
Subject: [PATCH] add loongarch support for libxcrypt
|
||||||
|
|
||||||
|
---
|
||||||
|
lib/libcrypt.map.in | 2 +-
|
||||||
|
lib/libcrypt.minver | 1 +
|
||||||
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/lib/libcrypt.map.in b/lib/libcrypt.map.in
|
||||||
|
index 88ea911..2142757 100644
|
||||||
|
--- a/lib/libcrypt.map.in
|
||||||
|
+++ b/lib/libcrypt.map.in
|
||||||
|
@@ -42,6 +42,6 @@ fcrypt - GLIBC_2.0
|
||||||
|
# libcrypt.minver. The ordering is left to right, top to bottom.
|
||||||
|
%chain GLIBC_2.0 GLIBC_2.2 GLIBC_2.2.1 GLIBC_2.2.2 GLIBC_2.2.5 GLIBC_2.2.6
|
||||||
|
%chain GLIBC_2.3 GLIBC_2.4 GLIBC_2.12 GLIBC_2.16 GLIBC_2.17 GLIBC_2.18
|
||||||
|
-%chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33 GLIBC_2.35
|
||||||
|
+%chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33 GLIBC_2.34 GLIBC_2.35
|
||||||
|
%chain GLIBC_2.36
|
||||||
|
%chain OW_CRYPT_1.0 XCRYPT_2.0 XCRYPT_4.3 XCRYPT_4.4
|
||||||
|
diff --git a/lib/libcrypt.minver b/lib/libcrypt.minver
|
||||||
|
index 8478077..34cae9d 100644
|
||||||
|
--- a/lib/libcrypt.minver
|
||||||
|
+++ b/lib/libcrypt.minver
|
||||||
|
@@ -62,6 +62,7 @@ ERROR kfreebsd.*gnu .
|
||||||
|
# Linux with GNU libc
|
||||||
|
GLIBC_2.36 linux.*gnu loongarch64 __WORDSIZE == 64 && ULONG_MAX != UINT_MAX /* lp64* ABI */
|
||||||
|
GLIBC_2.35 linux.*gnu or1k
|
||||||
|
+GLIBC_2.34 linux.*gnu loongarch64
|
||||||
|
GLIBC_2.33 linux.*gnu riscv32
|
||||||
|
GLIBC_2.32 linux.*gnu arc
|
||||||
|
GLIBC_2.29 linux.*gnu csky
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -1,16 +1,14 @@
|
|||||||
%define libdir /lib64
|
%define libdir /lib64
|
||||||
Name: libxcrypt
|
Name: libxcrypt
|
||||||
Version: 4.4.36
|
Version: 4.4.36
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Extended crypt library for DES, MD5, Blowfish and others
|
Summary: Extended crypt library for DES, MD5, Blowfish and others
|
||||||
License: LGPLv2+ and BSD and Public Domain
|
License: LGPLv2+ and BSD and Public Domain
|
||||||
URL: https://github.com/besser82/%{name}
|
URL: https://github.com/besser82/%{name}
|
||||||
Source0: https://github.com/besser82/%{name}/archive/v%{version}.tar.gz
|
Source0: https://github.com/besser82/%{name}/archive/v%{version}.tar.gz
|
||||||
|
|
||||||
Patch9000: add-sm3-crypt-support.patch
|
Patch9000: add-sm3-crypt-support.patch
|
||||||
%ifarch loongarch64
|
Patch9001: add-loongarch-support-for-libxcrypt.patch
|
||||||
Patch9001: 0001-add-loongarch-support.patch
|
|
||||||
%endif
|
|
||||||
|
|
||||||
BuildRequires: perl >= 5.14.0
|
BuildRequires: perl >= 5.14.0
|
||||||
BuildRequires: autoconf libtool fipscheck
|
BuildRequires: autoconf libtool fipscheck
|
||||||
@ -104,6 +102,9 @@ autoreconf -fiv
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 6 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 4.4.36-2
|
||||||
|
- Fix build error for loongarch64
|
||||||
|
|
||||||
* Thu Jul 13 2023 yixiangzhike <yixiangzhike007@163.com> - 4.4.36-1
|
* Thu Jul 13 2023 yixiangzhike <yixiangzhike007@163.com> - 4.4.36-1
|
||||||
- update to 4.4.36
|
- update to 4.4.36
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user