From 138c02309bd5cb83bcd8b2349a076a63a0008914 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 5 Jun 2025 09:45:19 +0800 Subject: [PATCH] 11.8.2 --- ...adb-11.8.1.tar.gz => mariadb-11.8.2.tar.gz | 4 +-- ...uilding-with-Clang-and-GCC-on-RISC-V.patch | 28 ------------------- mariadb-wsrep-lib-port-to-newer-cmake.patch | 13 --------- mariadb.spec | 11 ++++---- 4 files changed, 8 insertions(+), 48 deletions(-) rename mariadb-11.8.1.tar.gz => mariadb-11.8.2.tar.gz (32%) delete mode 100644 mariadb-fix-building-with-Clang-and-GCC-on-RISC-V.patch delete mode 100644 mariadb-wsrep-lib-port-to-newer-cmake.patch diff --git a/mariadb-11.8.1.tar.gz b/mariadb-11.8.2.tar.gz similarity index 32% rename from mariadb-11.8.1.tar.gz rename to mariadb-11.8.2.tar.gz index ae8279f..1e3af51 100644 --- a/mariadb-11.8.1.tar.gz +++ b/mariadb-11.8.2.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c58e9e96e8e69dba09aa179b9bea63fc2775f3194efb72dfc2c277abfb9936e5 -size 112837824 +oid sha256:b2162cdf5e9317d8a8621cbeda83999324fc0ac8944210e14abb5fe0a9fea3ef +size 116456706 diff --git a/mariadb-fix-building-with-Clang-and-GCC-on-RISC-V.patch b/mariadb-fix-building-with-Clang-and-GCC-on-RISC-V.patch deleted file mode 100644 index dc76a28..0000000 --- a/mariadb-fix-building-with-Clang-and-GCC-on-RISC-V.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 05be1865a9c16e34296ea0fa28b9bee921f0b907 Mon Sep 17 00:00:00 2001 -From: Brad Smith -Date: Fri, 7 Mar 2025 02:04:01 -0500 -Subject: [PATCH] Fix building with Clang and GCC on RISC-V - -Clang does not have the builtin __builtin_riscv_pause(). ---- - include/my_cpu.h | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/include/my_cpu.h b/include/my_cpu.h -index bd5fca5f21bd8..2b34e03fce347 100644 ---- a/include/my_cpu.h -+++ b/include/my_cpu.h -@@ -97,7 +97,12 @@ static inline void MY_RELAX_CPU(void) - /* Changed from __ppc_get_timebase for musl and clang compatibility */ - __builtin_ppc_get_timebase(); - #elif defined __GNUC__ && defined __riscv -- __builtin_riscv_pause(); -+ /* The GCC-only __builtin_riscv_pause() or the pause instruction is -+ encoded like a fence instruction with special parameters. On RISC-V -+ implementations that do not support arch=+zihintpause this -+ instruction could be interpreted as a more expensive memory fence; -+ it should not be an illegal instruction. */ -+ __asm__ volatile(".long 0x0100000f" ::: "memory"); - #elif defined __GNUC__ - /* Mainly, prevent the compiler from optimizing away delay loops */ - __asm__ __volatile__ ("":::"memory"); diff --git a/mariadb-wsrep-lib-port-to-newer-cmake.patch b/mariadb-wsrep-lib-port-to-newer-cmake.patch deleted file mode 100644 index 4a0dc1b..0000000 --- a/mariadb-wsrep-lib-port-to-newer-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/wsrep-lib/CMakeLists.txt b/wsrep-lib/CMakeLists.txt -index ef2f4c8..c35c85b 100644 ---- a/wsrep-lib/CMakeLists.txt -+++ b/wsrep-lib/CMakeLists.txt -@@ -2,7 +2,7 @@ - # Copyright (C) 2021 Codership Oy - # - --cmake_minimum_required (VERSION 2.8) -+cmake_minimum_required (VERSION 2.8...${CMAKE_VERSION}) - - # Parse version from version header file and store it into - # WSREP_LIB_VERSION. diff --git a/mariadb.spec b/mariadb.spec index af9f050..cfcffee 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -73,8 +73,8 @@ %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 11.8.1 -Release: 3 +Version: 11.8.2 +Release: 1 Epoch: 4 Summary: A very fast and robust SQL database server @@ -101,7 +101,6 @@ Source71: LICENSE.clustercheck Source72: mariadb-server-galera.te -Patch1: mariadb-wsrep-lib-port-to-newer-cmake.patch # Patch4: yum distributions specific logrotate fix # it would be big unexpected change, if we start shipping it now. Better wait for MariaDB 10.2 Patch4: %{pkgnamepatch}-logrotate.patch @@ -113,8 +112,6 @@ Patch9: %{pkgnamepatch}-ownsetup.patch Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch # Patch11: Use PCDIR CMake option, if configured Patch11: %{pkgnamepatch}-pcdir.patch -# Patch12: Older version of GCC and Clang does not have the builtin __builtin_riscv_pause() -Patch12: %{pkgnamepatch}-fix-building-with-Clang-and-GCC-on-RISC-V.patch BuildRequires: ninja-build mold BuildRequires: cmake gcc-c++ @@ -867,6 +864,7 @@ rm %{buildroot}%{_bindir}/mytop rm %{buildroot}%{_mandir}/man1/mytop.1* # Should be shipped with mariadb-connector-c +rm %{buildroot}%{_libdir}/mariadb/plugin/parsec.so rm %{buildroot}%{_mandir}/man1/mariadb_config.1* # put logrotate script where it needs to be @@ -1458,6 +1456,9 @@ fi %endif %changelog +* Thu Jun 05 2025 Funda Wang - 4:11.8.2-1 +- update to 11.8.2 GA + * Wed May 7 2025 Dingli Zhang - 4:11.8.1-3 - Fix building with Clang and GCC on RISC-V -- Gitee