From 1ed47f6b1ef9d0300dfd17276b995936327301a2 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 1 Dec 2025 16:03:24 +0800 Subject: [PATCH] use GNUInstallDirs for libdir recognization --- add-loongarch64-to-lib64-matches.patch | 25 ----------- add-riscv64-to-lib64-matches.patch | 25 ----------- mariadb-connector-c.spec | 10 +++-- ...InstallDirs-for-libdir-recognization.patch | 43 +++++++++++++++++++ 4 files changed, 49 insertions(+), 54 deletions(-) delete mode 100644 add-loongarch64-to-lib64-matches.patch delete mode 100644 add-riscv64-to-lib64-matches.patch create mode 100644 use-GNUInstallDirs-for-libdir-recognization.patch diff --git a/add-loongarch64-to-lib64-matches.patch b/add-loongarch64-to-lib64-matches.patch deleted file mode 100644 index 2dd9f69..0000000 --- a/add-loongarch64-to-lib64-matches.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a610c3fd999a4fdf9f719572c6e16490f0160e8e Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Mon, 1 Dec 2025 10:57:45 +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 264e2ac..1256ffa 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 "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/mariadb-connector-c.spec b/mariadb-connector-c.spec index 004e7b9..6fa4ead 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,14 +1,13 @@ Name: mariadb-connector-c Version: 3.4.7 -Release: 2 +Release: 3 Summary: MariaDB connector library in C License: LGPL-2.1-or-later URL: https://mariadb.com/kb/en/mariadb-connector-c/ Source0: https://archive.mariadb.org/connector-c-%{version}/%{name}-%{version}-src.tar.gz +Patch0001: use-GNUInstallDirs-for-libdir-recognization.patch Patch0003: mariadb-connector-c-3.1.13-src-sw.patch -Patch0004: add-riscv64-to-lib64-matches.patch -Patch0005: add-loongarch64-to-lib64-matches.patch BuildRequires: cmake >= 3.12 BuildRequires: gcc @@ -52,7 +51,7 @@ This package includes library and header files for development. -DINSTALL_LIBDIR="%{_lib}" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_PLUGINDIR="%{_lib}/mariadb/plugin" \ - -DINSTALL_PCDIR_RPM="%{_lib}/pkgconfig" \ + -DINSTALL_PCDIR="%{_lib}/pkgconfig" \ -DWITH_UNITTEST=ON %cmake_build @@ -100,6 +99,9 @@ end %{_mandir}/man3/{mariadb,mysql}_*.3* %changelog +* Mon Dec 01 2025 Funda Wang - 3.4.7-3 +- use GNUInstallDirs for libdir recognization + * Mon Dec 01 2025 Wenlong Zhang - 3.4.7-2 - add loongarch64 to lib64 matches diff --git a/use-GNUInstallDirs-for-libdir-recognization.patch b/use-GNUInstallDirs-for-libdir-recognization.patch new file mode 100644 index 0000000..c631b5b --- /dev/null +++ b/use-GNUInstallDirs-for-libdir-recognization.patch @@ -0,0 +1,43 @@ +From 9c227aa3c7021145816288b337fb2fc2e862330c Mon Sep 17 00:00:00 2001 +From: Funda Wang +Date: Mon, 1 Dec 2025 15:51:37 +0800 +Subject: [PATCH] use GNUInstallDirs for libdir recognizaiton + +--- + cmake/install.cmake | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +diff --git a/cmake/install.cmake b/cmake/install.cmake +index 90bae8b..7413b3f 100644 +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -34,6 +34,7 @@ SET(INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE + IF(UNIX) + IF(INSTALL_LAYOUT MATCHES "RPM") + SET(libmariadb_prefix "/usr") ++ include(GNUInstallDirs) + ELSEIF(INSTALL_LAYOUT MATCHES "DEFAULT|DEB") + SET(libmariadb_prefix ${CMAKE_INSTALL_PREFIX}) + ENDIF() +@@ -76,15 +77,9 @@ 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) +- SET(INSTALL_LIBDIR_RPM "lib64/mariadb") +- SET(INSTALL_PCDIR_RPM "lib64/pkgconfig") +- SET(INSTALL_PLUGINDIR_RPM "lib64/mariadb/plugin") +-ELSE() +- SET(INSTALL_LIBDIR_RPM "lib/mariadb") +- SET(INSTALL_PCDIR_RPM "lib/pkgconfig") +- SET(INSTALL_PLUGINDIR_RPM "lib/mariadb/plugin") +-ENDIF() ++SET(INSTALL_LIBDIR_RPM "${CMAKE_INSTALL_LIBDIR}/mariadb") ++SET(INSTALL_PCDIR_RPM "${CMAKE_INSTALL_LIBDIR}/pkgconfig") ++SET(INSTALL_PLUGINDIR_RPM "${CMAKE_INSTALL_LIBDIR}/mariadb/plugin") + SET(INSTALL_INCLUDEDIR_RPM "include") + SET(INSTALL_DOCDIR_RPM "docs") + SET(INSTALL_MANDIR_RPM "share/man") +-- +2.47.3 + -- Gitee