rpms/mariadb10.11
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Mark RISC-V64 as 64-bit architecture

Browse Source
This commit is contained in:
Andrew Lukoshko 2026-06-16 02:31:49 +00:00 committed by root
commit 6759d6fef7
6 changed files with 70 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mariadb10.11.spec
View File

@ -1,6 +1,6 @@
# Plain package name for cases, where %%{name} differs (e.g. for versioned packages)
%global majorname mariadb
%define package_version 10.11.15
%define package_version 10.11.18
%define majorversion %(echo %{package_version} | cut -d'.' -f1-2 )
# Set if this package will be the default one in distribution
@ -15,7 +15,7 @@
# The last version on which the full testsuite has been run
# In case of further rebuilds of that version, don't require full testsuite to be run
# run only "main" suite
%global last_tested_version 10.11.15
%global last_tested_version 10.11.18
# Set to 1 to force run the testsuite even if it was already tested in current version
%global force_run_testsuite 0
@ -117,7 +117,7 @@
# the bundled library, since the package cannot be build with older version
# https://mariadb.com/kb/en/pcre/
%bcond_with unbundled_pcre
%global pcre_bundled_version 10.46
%global pcre_bundled_version 10.47
# To avoid issues with a breaking change in FMT library, bundle it on systems where FMT wasn't fixed yet
# See mariadb-libfmt.patch for detailed description.
@ -153,7 +153,7 @@
Name: %{majorname}%{majorversion}
Version: %{package_version}
Release: 2%{?with_debug:.debug}%{?dist}.alma.1
Release: 1%{?with_debug:.debug}%{?dist}.alma.1
Epoch: 3
Summary: A very fast and robust SQL database server
@ -222,6 +222,9 @@ Patch14: %{majorname}-mtr.patch
# Patch15: fix bundled pcre version to 10.46 because of CVE-2025-58050
Patch15: pcre_bundling.patch
# AlmaLinux Patch
Patch1001: mark-RISC-V64-as-64-bit-architecture.patch
# This macro is used for package/sub-package names in the entire specfile
%if %?mariadb_default
%global pkgname %{majorname}
@ -863,6 +866,9 @@ rm -r storage/rocksdb/
%patch -P15 -p1
%endif
# Applying AlmaLinux Patch
%patch -P1001 -p1 -b .mark-RISC-V64-as-64-bit-architecture
# generate a list of tests that fail, but are not disabled by upstream
cat %{SOURCE50} | tee -a mysql-test/unstable-tests
@ -1204,7 +1210,7 @@ rm %{buildroot}%{_mandir}/man1/{mariadb-client-test-embedded,mariadb-test-embedd
%if %{without clibrary}
# Client part should be included in package 'mariadb-connector-c'
find %{buildroot} -name libmariadb.pc -delete
rm %{buildroot}%{_libdir}/pkgconfig/libmariadb.pc
rm %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
# Client library and links
@ -1515,7 +1521,6 @@ fi
%if %{with galera}
%files -n %{pkgname}-server-galera
%doc Docs/README-wsrep
%license LICENSE.clustercheck
%{_bindir}/clustercheck
%{_bindir}/galera_new_cluster
@ -1803,6 +1808,8 @@ fi
%endif
%{_bindir}/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test}
%{_bindir}/my_safe_process
%dir %{_libdir}/%{majorname}/plugin
%dir %{_libdir}/%{majorname}/plugin/test_pam_modules/
%attr(-,mysql,mysql) %{_datadir}/mysql-test
%{_mandir}/man1/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test}.1*
%{_mandir}/man1/my_safe_process.1*
@ -1811,8 +1818,17 @@ fi
%endif
%changelog
* Tue Feb 03 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 3:10.11.15-2.alma.1
- Fix build on riscv64
* Tue Jun 16 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 3:10.11.18-1.alma.1
- Mark RISC-V64 as 64-bit architecture
* Wed Jun 03 2026 Pavol Sloboda <psloboda@redhat.com> - 3:10.11.18-1
- Rebase to 10.11.18
* Tue May 26 2026 Pavol Sloboda <psloboda@redhat.com> - 3:10.11.17-1
- Rebase to 10.11.17
* Sat Feb 07 2026 Michal Schorm <mschorm@redhat.com> - 3:10.11.16-1
- Rebase to 10.11.16
* Tue Jan 20 2026 Petr Khartskhaev <pkhartsk@redhat.com> - 3:10.11.15-2
- Updated service files to work with environment files

30
mark-RISC-V64-as-64-bit-architecture.patch Normal file
View File

@ -0,0 +1,30 @@
Upstream-status: https://github.com/mariadb-corporation/mariadb-connector-c/pull/295
From d43c1ac8479431281ee524a754fd17126e08f0d5 Mon Sep 17 00:00:00 2001
Message-ID: <d43c1ac8479431281ee524a754fd17126e08f0d5.1764580375.git.mjuszkiewicz@redhat.com>
From: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
Date: Mon, 1 Dec 2025 10:10:17 +0100
Subject: [PATCH] mark RISC-V64 as 64-bit architecture
Signed-off-by: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
---
cmake/install.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libmariadb/cmake/install.cmake b/libmariadb/cmake/install.cmake
index 90bae8b5..264e2ace 100644
--- a/libmariadb/cmake/install.cmake
+++ b/libmariadb/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.52.0

17
pcre_bundling.patch
View File

@ -1,15 +1,12 @@
diff --git a/cmake/pcre.cmake b/cmake/pcre.cmake
index 08353e92..fc869ba9 100644
--- a/cmake/pcre.cmake
+++ b/cmake/pcre.cmake
@@ -64,8 +64,8 @@ MACRO(BUNDLE_PCRE2)
diff -Naur mariadb-10.11.17/cmake/pcre.cmake mariadb-10.11.17_patched/cmake/pcre.cmake
--- mariadb-10.11.17/cmake/pcre.cmake 2026-05-08 07:43:18.000000000 +0200
+++ mariadb-10.11.17_patched/cmake/pcre.cmake 2026-05-27 09:24:27.696297932 +0200
@@ -65,7 +65,7 @@
ExternalProject_Add(
pcre2
PREFIX "${dir}"
- URL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.45/pcre2-10.45.zip"
- URL_MD5 873da56c6469ec207ca5c5ae9688b83a
+ URL "file:///${dir}/pcre2-10.46.zip"
+ URL_MD5 261f3f9e14b6ce175103c5118a189faa
- URL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.47/pcre2-10.47.zip"
+ URL "file:///${dir}/pcre2-10.47.zip"
URL_MD5 7906aec38f872b74f1b925122dde9069
INSTALL_COMMAND ""
CMAKE_ARGS
"-DCMAKE_WARN_DEPRECATED=FALSE"

3
plans.fmf
View File

@ -13,6 +13,8 @@
/centos-stream:
environment:
BUILD_PACKAGE: mariadb-server
context:
dbver: mariadb-10.11
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/mariadb
@ -25,4 +27,3 @@
import:
url: https://gitlab.com/redhat/centos-stream/tests/mariadb
name: /plans/versioned/galera-single-host

5
rh-skipped-tests-base.list
View File

@ -18,6 +18,8 @@ sys_vars.slave_parallel_threads_basic :
# Expected to fail, the plugin is not build with server, but 'mariadb-connector-c' instead
plugins.auth_ed25519 :
plugins.multiauth :
plugins.mdev38431 :
plugins.mdev38550 :
# ------------------------------
perfschema.nesting : #1399847
@ -125,3 +127,6 @@ encryption.compressed_import_tablespace :
# Unstable since 10.11.11
parts.partition_alter1_1_2_innodb :
# Fails since 10.11.17
main.chained_ssl_certificates :

4
sources
View File

@ -1,3 +1,3 @@
SHA512 (mariadb-10.11.15.tar.gz) = 98d1e54954b69cf87a96be7d76f80333f27832a29279e6b0a9615b830e171713222abcb9ec9b9a545c0fc4a0f9f8e3d4774babcabf534a6fa3cb3dfdaed0dedc
SHA512 (mariadb-10.11.18.tar.gz) = 45fa3c746138aa51b55d61efe11d44b0476fdcb104d5a40929ca2910145668ae749664e2afed7f9d59825d5b2b14e920c012513a4efa4eb0f8af1607d44ae31b
SHA512 (fmt-11.0.2.zip) = 06eba9a2a8d1c2269801e10a00ed26a9344b79bca0391a6b10f35e9716682f8345125fceb96e9ca36ffbd4c0558b0e63e4c45a9dff09a8ee186458ec68e34198
SHA512 (pcre2-10.46.zip) = 1381ba2fe352ba33b90c416c25d2ee057f167fae3ecd9a56743ee2d381fd5793cd65dec07018ed77ce8576eaac993498ad6824cb58bf9fae2f5756881f4a9f9b
SHA512 (pcre2-10.47.zip) = e71fdb0d2d84d215ffd4c8ab4fe665a11e8fcc7db18fd4f43c655bca767665064fd65a8982a83d4f375f25f24c7482345dcb52e0bf427a14ff12d103222e1023