!9 添加sw架构

From: @wuzx065891 
Reviewed-by: @lvying6 
Signed-off-by: @lvying6
This commit is contained in:
openeuler-ci-bot 2022-11-24 11:25:11 +00:00 committed by Gitee
commit 66bb282474
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From a84e910ee8c0991ee23da668f9e849da3b03ebed Mon Sep 17 00:00:00 2001
From: wzx <wuzx1226@qq.com>
Date: Thu, 24 Nov 2022 15:11:53 +0800
Subject: [PATCH] Add sw64 architecture
Add sw64 architecture in file crypto/crypt_blowfish.c according to alpha architecture to support sw64 architecture.
Signed-off-by: wzx <wuzx1226@qq.com>
---
crypto/crypt_blowfish.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/crypt_blowfish.c b/crypto/crypt_blowfish.c
index 3d306cf..c22b06b 100644
--- a/crypto/crypt_blowfish.c
+++ b/crypto/crypt_blowfish.c
@@ -56,7 +56,7 @@
#ifdef __i386__
#define BF_ASM 0
#define BF_SCALE 1
-#elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__)
+#elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__) || defined(__sw_64__)
#define BF_ASM 0
#define BF_SCALE 1
#else
--
2.33.0

View File

@ -2,7 +2,7 @@
Name: apr-util Name: apr-util
Version: 1.6.1 Version: 1.6.1
Release: 12 Release: 13
Summary: apr-util provides a number of helpful abstractions on top of APR. Summary: apr-util provides a number of helpful abstractions on top of APR.
License: ASL 2.0 License: ASL 2.0
URL: http://apr.apache.org URL: http://apr.apache.org
@ -13,6 +13,7 @@ Patch6001: Merge-r1822315-from-trunk.patch
Patch6002: Fix-error-handling-in-gdbm.patch Patch6002: Fix-error-handling-in-gdbm.patch
Patch6003: Merge-r1834022-r1834023-r1834024-from-trunk.patch Patch6003: Merge-r1834022-r1834023-r1834024-from-trunk.patch
Patch6004: Remove-dereference-of-null-pointer.patch Patch6004: Remove-dereference-of-null-pointer.patch
Patch6005: apr-util-Add-sw64-architecture.patch
BuildRequires: gcc autoconf apr-devel >= 1.6.0 gdbm-devel expat-devel libuuid-devel BuildRequires: gcc autoconf apr-devel >= 1.6.0 gdbm-devel expat-devel libuuid-devel
BuildRequires: mariadb-connector-c-devel sqlite-devel >= 3.1.0 openldap-devel openssl-devel BuildRequires: mariadb-connector-c-devel sqlite-devel >= 3.1.0 openldap-devel openssl-devel
@ -123,6 +124,9 @@ make test
%{_libdir}/%{name}-%{apuver}/apr_dbd_odbc* %{_libdir}/%{name}-%{apuver}/apr_dbd_odbc*
%changelog %changelog
* Thu Jul 28 2022 wuzx<wuzx1226@qq.com> - 1.6.1-13
- add sw64 patch
* Sat Jun 19 2021 panxiaohe <panxiaohe@huawei.com> - 1.6.1-12 * Sat Jun 19 2021 panxiaohe <panxiaohe@huawei.com> - 1.6.1-12
- BuildRequires: replace libdb with gdbm - BuildRequires: replace libdb with gdbm
- Add requires gdbm-devel - Add requires gdbm-devel