Add sw64 architecture

Signed-off-by: wzx <wuzx1226@qq.com>
(cherry picked from commit c4486ff15dd744f3b2e271c00c1ce20993c5a066)
This commit is contained in:
wzx 2022-10-22 17:14:14 +08:00 committed by openeuler-sync-bot
parent 70f51359cb
commit a6b43aa6e9
2 changed files with 32 additions and 1 deletions

23
libxcrypt-4.4.26-sw.patch Executable file
View File

@ -0,0 +1,23 @@
diff -uNar libxcrypt-4.4.26.org/lib/crypt-bcrypt.c libxcrypt-4.4.26.sw/lib/crypt-bcrypt.c
--- libxcrypt-4.4.26.org/lib/crypt-bcrypt.c 2022-02-15 12:55:07.000000000 +0000
+++ libxcrypt-4.4.26.sw/lib/crypt-bcrypt.c 2022-02-15 12:55:49.510000000 +0000
@@ -52,7 +52,7 @@
#if INCLUDE_bcrypt || INCLUDE_bcrypt_a || INCLUDE_bcrypt_x || INCLUDE_bcrypt_y
#if defined(__i386__) || defined(__x86_64__) || \
- defined(__alpha__) || defined(__hppa__)
+ defined(__alpha__) || defined(__hppa__) || defined(__sw_64__)
#define BF_SCALE 1
#else
#define BF_SCALE 0
diff -uNar libxcrypt-4.4.26.org/lib/libcrypt.minver libxcrypt-4.4.26.sw/lib/libcrypt.minver
--- libxcrypt-4.4.26.org/lib/libcrypt.minver 2022-02-15 12:55:07.000000000 +0000
+++ libxcrypt-4.4.26.sw/lib/libcrypt.minver 2022-02-15 14:16:36.550000000 +0000
@@ -76,6 +76,7 @@
GLIBC_2.2.5 linux.*gnu x86_64 defined __x86_64__ && ULONG_MAX != UINT_MAX /* 64 */
GLIBC_2.2 linux.*gnu s390x
GLIBC_2.0 linux.*gnu alpha
+GLIBC_2.0 linux.*gnu sw_64
GLIBC_2.0 linux.*gnu e2k
GLIBC_2.0 linux.*gnu hppa
GLIBC_2.0 linux.*gnu i[3-9]86

View File

@ -1,13 +1,18 @@
%ifarch sw_64
%define libdir /lib
%else
%define libdir /lib64
%endif
Name: libxcrypt
Version: 4.4.26
Release: 3
Release: 4
Summary: Extended crypt library for DES, MD5, Blowfish and others
License: LGPLv2+ and BSD and Public Domain
URL: https://github.com/besser82/%{name}
Source0: https://github.com/besser82/%{name}/archive/v%{version}.tar.gz
Patch9000: add-sm3-crypt-support.patch
Patch9001: libxcrypt-4.4.26-sw.patch
BuildRequires: autoconf libtool fipscheck
BuildRequires: perl >= 5.14.0
@ -101,6 +106,9 @@ autoreconf -fiv
%changelog
* Fri Oct 21 2022 wuzx<wuzx1226@qq.com> - 4.4.26-4
- add sw64 patch
* Wed Oct 19 2022 yixiangzhike <yixiangzhike007@163.com> - 4.4.26-3
- use the macro make_build instead of make to support multitasking in check