From 3b1faca5cf24b2f35684057c2cf0259f5e45b2e6 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Fri, 28 Nov 2025 17:53:57 +0800 Subject: [PATCH] add loongarch64 to lib64 matches (cherry picked from commit c313f2112ad54e4bdde0513557becd7b5e79a1a4) --- add-loongarch64-to-lib64-matches.patch | 25 +++++++++++++++++++++++++ mariadb-connector-c.spec | 10 +++++----- 2 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 add-loongarch64-to-lib64-matches.patch diff --git a/add-loongarch64-to-lib64-matches.patch b/add-loongarch64-to-lib64-matches.patch new file mode 100644 index 0000000..2d0a195 --- /dev/null +++ b/add-loongarch64-to-lib64-matches.patch @@ -0,0 +1,25 @@ +From 318096dd8b6a4257f1621daa5662dd12466fb80b Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Fri, 28 Nov 2025 17:49:39 +0800 +Subject: [PATCH] add loongarch64 to lib64 matches + +--- + cmake/install.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/install.cmake b/cmake/install.cmake +index f6d2a7e..9e28882 100644 +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -76,7 +76,7 @@ SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient") + # RPM layout + # + SET(INSTALL_BINDIR_RPM "bin") +-IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x" OR CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "sw_64") AND CMAKE_SIZEOF_VOID_P EQUAL 8) ++IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x" OR CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "sw_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "loongarch64") AND CMAKE_SIZEOF_VOID_P EQUAL 8) + SET(INSTALL_LIBDIR_RPM "lib64/mariadb") + SET(INSTALL_PCDIR_RPM "lib64/pkgconfig") + SET(INSTALL_PLUGINDIR_RPM "lib64/mariadb/plugin") +-- +2.43.0 + diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 00abcc4..c548549 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,6 +1,6 @@ Name: mariadb-connector-c Version: 3.3.8 -Release: 4 +Release: 5 Summary: MariaDB connector library in C License: LGPLv2+ URL: https://github.com/MariaDB/mariadb-connector-c @@ -9,6 +9,7 @@ Source0: https://downloads.mariadb.com/Connectors/c/connector-c-%{version Patch0003: mariadb-connector-c-3.1.13-src-sw.patch Patch0004: add-riscv64-to-lib64-matches.patch Patch0005: add-sw64-to-lib64-matches.patch +Patch0006: add-loongarch64-to-lib64-matches.patch BuildRequires: libcurl-devel zlib-devel openssl-devel BuildRequires: cmake gcc @@ -93,14 +94,13 @@ end %dir %{_includedir}/mysql %{_includedir}/mysql/* %{_libdir}/*.so -%ifarch loongarch64 -%{_prefix}/lib/pkgconfig/libmariadb.pc -%else %{_libdir}/pkgconfig/libmariadb.pc -%endif %{_mandir}/man3/{mariadb,mysql}_*.3* %changelog +* Fri Nov 28 2025 Wenlong Zhang - 3.3.8-5 +- add loongarch64 to lib64 matches + * Tue Jul 01 2025 wangmian - 3.3.8-4 - Fixed bug for macros in Changelog -- Gitee