Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c79d28c6de |
@ -170,7 +170,7 @@
|
||||
|
||||
Name: %{majorname}%{majorversion}
|
||||
Version: %{package_version}
|
||||
Release: 1%{?with_debug:.debug}%{?dist}
|
||||
Release: 1%{?with_debug:.debug}%{?dist}.alma.1
|
||||
Epoch: 3
|
||||
|
||||
Summary: A very fast and robust SQL database server
|
||||
@ -240,6 +240,9 @@ Patch14: %{majorname}-mtr.patch
|
||||
Patch16: %{majorname}-federated.patch
|
||||
Patch18: 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}
|
||||
@ -900,6 +903,9 @@ rm -r storage/rocksdb/
|
||||
%patch -P18 -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
|
||||
|
||||
@ -1856,6 +1862,9 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Feb 17 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 3:11.8.5-1.alma.1
|
||||
- Mark RISC-V64 as 64-bit architecture
|
||||
|
||||
* Mon Dec 1 2025 Pavol Sloboda <psloboda@redhat.com> - 3:11.8.5-1
|
||||
- Rebase to 11.8.5
|
||||
|
||||
|
||||
30
mark-RISC-V64-as-64-bit-architecture.patch
Normal file
30
mark-RISC-V64-as-64-bit-architecture.patch
Normal 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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user