From 605f80837f1e9b86f7c67f37aa5f899d8b54cc0d Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 1 Dec 2025 16:06:51 +0800 Subject: [PATCH] use variable rather than arch-dependent patches for libdir recognization (cherry picked from commit 76903829fe6eb138b365912f4b526422a8688efe) --- add-loongarch64-to-lib64-matches.patch | 25 ------------------------- add-riscv64-to-lib64-matches.patch | 25 ------------------------- add-sw64-to-lib64-matches.patch | 25 ------------------------- mariadb-connector-c.spec | 9 +++++---- 4 files changed, 5 insertions(+), 79 deletions(-) delete mode 100644 add-loongarch64-to-lib64-matches.patch delete mode 100644 add-riscv64-to-lib64-matches.patch delete mode 100644 add-sw64-to-lib64-matches.patch diff --git a/add-loongarch64-to-lib64-matches.patch b/add-loongarch64-to-lib64-matches.patch deleted file mode 100644 index 2d0a195..0000000 --- a/add-loongarch64-to-lib64-matches.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/add-riscv64-to-lib64-matches.patch b/add-riscv64-to-lib64-matches.patch deleted file mode 100644 index 0e071a6..0000000 --- a/add-riscv64-to-lib64-matches.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d2a3bc9049f364b10f9f586c993e0eac60eee254 Mon Sep 17 00:00:00 2001 -From: laokz -Date: Sat, 1 Jun 2024 13:04:38 +0800 -Subject: [PATCH] add riscv64 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 90bae8b..264e2ac 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") 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") 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.39.2 - diff --git a/add-sw64-to-lib64-matches.patch b/add-sw64-to-lib64-matches.patch deleted file mode 100644 index da7f998..0000000 --- a/add-sw64-to-lib64-matches.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1fb8e24afd7849ac7e5c4644ecc72a5be86504d4 Mon Sep 17 00:00:00 2001 -From: maqi -Date: Fri, 28 Feb 2025 09:50:49 +0800 -Subject: [PATCH] add sw64 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 264e2ac..f6d2a7e 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") 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") 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.39.3 - diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index c548549..e1cb585 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,15 +1,12 @@ Name: mariadb-connector-c Version: 3.3.8 -Release: 5 +Release: 6 Summary: MariaDB connector library in C License: LGPLv2+ URL: https://github.com/MariaDB/mariadb-connector-c Source0: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz 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 @@ -47,6 +44,7 @@ This package includes library and header files for development. -DINSTALL_BINDIR="bin" \ -DINSTALL_LIBDIR="%{_lib}" \ -DINSTALL_INCLUDEDIR="include/mysql" \ + -DINSTALL_PCDIR="%{_libdir}/pkgconfig" \ -DINSTALL_PLUGINDIR="%{_lib}/mariadb/plugin" \ -DWITH_UNITTEST=ON %make_build @@ -98,6 +96,9 @@ end %{_mandir}/man3/{mariadb,mysql}_*.3* %changelog +* Mon Dec 01 2025 Funda Wang - 3.3.8-6 +- use variable rather than arch-dependent patches for libdir recognization + * Fri Nov 28 2025 Wenlong Zhang - 3.3.8-5 - add loongarch64 to lib64 matches -- Gitee