summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2024-05-28 20:52:47 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2024-06-11 14:04:03 -0500
commit3189ef4a30868ad644d8a2cffc3eb36d88ed686a (patch)
tree0f2656ce0815b5ad5c45728d20d52326a1a6c57e
parent18de0ed0c9a1554ee9ccd74066bf33da5f2f257b (diff)
downloadpackages-3189ef4a30868ad644d8a2cffc3eb36d88ed686a.tar.gz
packages-3189ef4a30868ad644d8a2cffc3eb36d88ed686a.tar.bz2
packages-3189ef4a30868ad644d8a2cffc3eb36d88ed686a.tar.xz
packages-3189ef4a30868ad644d8a2cffc3eb36d88ed686a.zip
user/mariadb: Add patch for build on GCC 13
-rw-r--r--user/mariadb/APKBUILD4
-rw-r--r--user/mariadb/missing-header.patch12
2 files changed, 15 insertions, 1 deletions
diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD
index 7c44f4c46..ee293e709 100644
--- a/user/mariadb/APKBUILD
+++ b/user/mariadb/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=mariadb
pkgver=10.6.4
-pkgrel=0
+pkgrel=1
pkgdesc="Open source database server"
url="https://mariadb.org/"
arch="all"
@@ -26,6 +26,7 @@ subpackages="$pkgname-client $pkgname-server $pkgname-libs $pkgname-embedded
$pkgname-doc $pkgname-dev"
source="https://archive.mariadb.org/$pkgname-$pkgver/source/$pkgname-$pkgver.tar.gz
ppchax.patch
+ missing-header.patch
mariadb.initd
mariadb-server.limits
"
@@ -270,5 +271,6 @@ doc() {
sha512sums="c216244ce126e6f8954303a76078dc12146e8ea941041edd215dc05201adda1d5158cd7f1c9831328f783aba4f884965ae288f33bbc43229bc6224a4f1079071 mariadb-10.6.4.tar.gz
0cb265173923cb85517a1144cfa904dafe059c1f859e13b4415442cabbb414db5904f2dcee0e865914b0f9c181d1d61d220834cb187b14f8538a0d2552025a9d ppchax.patch
+6618ee5608b06941da08872ea7ea16149b72a0174b157f970c03a9a9110efe0704c72742e63181f8059244e89fe25d1b07f1c87fed72115d62f347f58fafccdd missing-header.patch
1a2b058aad5fd6d6964db58b663591299a5bf82e7ad21a105d53a3e7ad1c3674c737caf3ee12799cce947cf8ead1f3e789dd8afcfc769891f08208b3006f9654 mariadb.initd
d47324b34a87410eddb554f65199d145dfba9ae40407a62fb77df4e1ebf13087d15eb28e61e5e7cc9139eb42f093a0955136edae4020822652a1f0b4e219849e mariadb-server.limits"
diff --git a/user/mariadb/missing-header.patch b/user/mariadb/missing-header.patch
new file mode 100644
index 000000000..bdb89daa3
--- /dev/null
+++ b/user/mariadb/missing-header.patch
@@ -0,0 +1,12 @@
+Needed for compilation on GCC 13.
+
+--- mariadb-10.6.4/tpool/aio_linux.cc.old 2021-08-03 09:48:41.000000000 -0500
++++ mariadb-10.6.4/tpool/aio_linux.cc 2024-05-28 18:55:26.914066003 -0500
+@@ -18,6 +18,7 @@
+
+ # include <thread>
+ # include <atomic>
++# include <cstdio>
+ # include <libaio.h>
+ # include <sys/syscall.h>
+