Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-12 18:59:50 +03:00
Code Issues Wiki Activity

main/mariadb: upgrade to 11.4.7

Browse source 
Bump mariadb version to 11.4.7.
11.4.6 was skipped due to a serious performance regression, see:
https://jira.mariadb.org/browse/MDEV-36759

The libfmt patch was adapted to the new version.

Mariabackup is still not working but will be in the next release
(11.4.8), see: https://jira.mariadb.org/browse/MDEV-34388
This commit is contained in:
Faustin Lammler 2025-06-04 15:15:09 +02:00 • committed by Natanael Copa
parent bbe4376421
commit 1c010371c3
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main/mariadb/APKBUILD
View file

@ -7,8 +7,8 @@
# Contributor: Jake Buchholz <tomalok@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mariadb
pkgver=11.4.5
pkgrel=2
pkgver=11.4.7
pkgrel=0
pkgdesc="A fast SQL database server"
url="https://www.mariadb.org/"
pkgusers="mysql"
@ -560,11 +560,11 @@ _plugin_rocksdb() {
}
sha512sums="
65b74e5443c2b7e8bc6a4c2a22838e3440bdbfef9c8fa6ed2b142e3ed0121d77a049c1054b05859ff8232386894ae0e7429d1a646ecf503e9c01c4952c83c51a mariadb-11.4.5.tar.gz
dba29199afcda7a974116f64bf7765444d8239455266f4a226396d228c2feaa03ba6551e1ef53e75efce833c109fac34a05a70c74a1c3e2cd06e4a7b2326b5c9 mariadb-11.4.7.tar.gz
c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c mariadb.initd
ec9068ee1da8276f04ac3654640cb6149e0f0a21ee77b133d7e5b82fa2ab2fd7971bce6ea3c5a5e094d8c6e2571f4ce43d7014b2767bb27e0a335005ced81968 gcc13.patch
cccaa99917913f5f08204464e7fb9865e30760a1933ff240c0035271f831058d2ea4ada867da164309bfc91f6b564ec13bb290900d90c3697866971c7666f91b lfs64.patch
7b4024818c8bb04fe5916905ceee79e93e24ee8c6d51593031967a106d1c001f2127a81acbbbb06aa4bb676ea00281a1cba03df7987177d97e7abe07efd7188f disable-failing-test.patch
4965275371e6d5e08e32a16fcfff2e68dfdcf6f4c30e5beffe18dcf56b503cbf373feeda814694e048964b16165ad65156c32fe27e974bed47201e8cf60736c6 have_stacktrace.patch
330f8a51af6e7ad1ae024d5a45478c148ce1cd80febe4348dd0f432cfd3cef9080317af7025ad7865563c854ebffc80582b3d31412fba53cd3f4d3738c62a975 libfmt.patch
91d5977b5eac5240c6e4f55f75cb425092f4a1ffbbf777ed3cb80f5d9be7929117364cb37cb95b52ca8aa257ec6dccfef8c57ab31099b5d3321fb9922ad3c6d1 libfmt.patch
"

10
main/mariadb/libfmt.patch
View file

@ -29,15 +29,14 @@ index a9dc6937b8690..9758b34c00135 100644
- IF(WITH_LIBFMT STREQUAL "system" OR WITH_LIBFMT STREQUAL "auto")
- SET(CMAKE_REQUIRED_INCLUDES ${LIBFMT_INCLUDE_DIR})
- CHECK_CXX_SOURCE_RUNS(
- "#define FMT_STATIC_THOUSANDS_SEPARATOR ','
- #define FMT_HEADER_ONLY 1
- "#define FMT_HEADER_ONLY 1
- #include <fmt/args.h>
- int main() {
- using ArgStore= fmt::dynamic_format_arg_store<fmt::format_context>;
- ArgStore arg_store;
- int answer= 4321;
- arg_store.push_back(answer);
- return fmt::vformat(\"{:L}\", arg_store).compare(\"4,321\");
- return fmt::vformat(\"{}\", arg_store).compare(\"4321\");
- }" HAVE_SYSTEM_LIBFMT)
- SET(CMAKE_REQUIRED_INCLUDES)
+MACRO(CHECK_LIBFMT)
@ -50,15 +49,14 @@ index a9dc6937b8690..9758b34c00135 100644
+
+ SET(CMAKE_REQUIRED_INCLUDES "${LIBFMT_INCLUDE_DIR}")
+ CHECK_CXX_SOURCE_RUNS(
+ "#define FMT_STATIC_THOUSANDS_SEPARATOR ','
+ #define FMT_HEADER_ONLY 1
+ "#define FMT_HEADER_ONLY 1
+ #include <fmt/args.h>
+ int main() {
+ using ArgStore= fmt::dynamic_format_arg_store<fmt::format_context>;
+ ArgStore arg_store;
+ int answer= 4321;
+ arg_store.push_back(answer);
+ return fmt::vformat(\"{:L}\", arg_store).compare(\"4,321\");
+ return fmt::vformat(\"{}\", arg_store).compare(\"4321\");
+ }"
+ HAVE_SYSTEM_LIBFMT
+ )