!78 [sync] PR-77: 添加sw架构

From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2022-11-16 06:29:15 +00:00 committed by Gitee
commit 719aef6e2f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 22 additions and 1 deletions

16
mariadb-10.5.10-sw.patch Executable file
View File

@ -0,0 +1,16 @@
diff -Naur mariadb-10.5.10.org/cmake/install_layout.cmake mariadb-10.5.10.sw/cmake/install_layout.cmake
--- mariadb-10.5.10.org/cmake/install_layout.cmake 2022-04-14 16:05:15.690000000 +0000
+++ mariadb-10.5.10.sw/cmake/install_layout.cmake 2022-04-18 14:29:06.470000000 +0000
@@ -140,7 +140,11 @@
SET(INSTALL_SYSCONF2DIR_RPM "/etc/my.cnf.d")
#
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
- SET(INSTALL_LIBDIR_RPM "lib64")
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "sw_64")
+ SET(INSTALL_LIBDIR_RPM "lib")
+ ELSE()
+ SET(INSTALL_LIBDIR_RPM "lib64")
+ ENDIF()
ELSE()
SET(INSTALL_LIBDIR_RPM "lib")
ENDIF()

View File

@ -74,7 +74,7 @@
Name: mariadb
Version: 10.5.16
Release: 1
Release: 2
Epoch: 4
Summary: A very fast and robust SQL database server
@ -112,6 +112,7 @@ Patch9: %{pkgnamepatch}-ownsetup.patch
Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch
# Patch11: Use PCDIR CMake option, if configured
Patch11: %{pkgnamepatch}-pcdir.patch
Patch12: mariadb-10.5.10-sw.patch
BuildRequires: make
BuildRequires: cmake gcc-c++
@ -623,6 +624,7 @@ sources.
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
# Remove JAR files that upstream puts into tarball
find . -name "*.jar" -type f -exec rm --verbose -f {} \;
@ -1474,6 +1476,9 @@ fi
%endif
%changelog
* Mon Oct 24 2022 wuzx<wuzx1226@qq.com> - 4:10.5.16-2
- Add sw64 architecture
* Thur May 26 2022 bzhaoop<bzhaojyathousandy@gmail.com> - 4:10.5.16-1
- Bump to 10.5.16 for resolving CVEs below
- CVE-2022-27385