From c13bec15d2aa3bb8d5cb20f3808b5c80198956b1 Mon Sep 17 00:00:00 2001 From: wzx Date: Mon, 24 Oct 2022 16:00:19 +0800 Subject: [PATCH] Add sw64 architecture Signed-off-by: wzx (cherry picked from commit 255d22411b185445fbb8dcd0e8e98f0c416e0de5) --- mariadb-10.5.10-sw.patch | 16 ++++++++++++++++ mariadb.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100755 mariadb-10.5.10-sw.patch diff --git a/mariadb-10.5.10-sw.patch b/mariadb-10.5.10-sw.patch new file mode 100755 index 0000000..64ccf07 --- /dev/null +++ b/mariadb-10.5.10-sw.patch @@ -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() diff --git a/mariadb.spec b/mariadb.spec index 07cb14b..5d5481c 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -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 - 4:10.5.16-2 +- Add sw64 architecture + * Thur May 26 2022 bzhaoop - 4:10.5.16-1 - Bump to 10.5.16 for resolving CVEs below - CVE-2022-27385 -- Gitee