aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2023-05-15 06:33:02 +0000
committerpsykose <alice@ayaya.dev>2023-05-15 08:36:37 +0200
commitbc7b6a1932be264b162a4dc49de408a219535d2c (patch)
tree23f647adab2d4bac1f0bb9933fb8f53a33093693
parent1e84e0b16730e8e7660a34f6260d41f2a293401f (diff)
main/mariadb: fix gcc13 build
-rw-r--r--main/mariadb/APKBUILD2
-rw-r--r--main/mariadb/gcc13.patch40
2 files changed, 42 insertions, 0 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD
index bb8fb803eea..af0fa050377 100644
--- a/main/mariadb/APKBUILD
+++ b/main/mariadb/APKBUILD
@@ -88,6 +88,7 @@ esac
source="https://mirrors.gigenet.com/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
$pkgname.initd
+ gcc13.patch
lfs64.patch
ppc-remove-glibc-dep.patch
disable-failing-test.patch
@@ -549,6 +550,7 @@ _plugin_rocksdb() {
sha512sums="
84de65230a99d7a0b2079cf1287723a30cb86e5c4f8e756503b260b8e495b454ed15fd5b959c9c12f6d8db2610993f3c8ff92cbdee6520bfbdcd5763dccdae07 mariadb-10.11.3.tar.gz
c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c mariadb.initd
+ec9068ee1da8276f04ac3654640cb6149e0f0a21ee77b133d7e5b82fa2ab2fd7971bce6ea3c5a5e094d8c6e2571f4ce43d7014b2767bb27e0a335005ced81968 gcc13.patch
466d21376f6abae024aee26af701aa93275734c47a9c93084cec17e2e089667d059fbf76ea9c748c97de4a4b37c6663370f1d1f2183e17e69bd98213a57667ce lfs64.patch
20331e52e3dc419b4833e3c16bbb9828b9591f8aa3b6fce93c592161f3cae403c4a5d073369b2383d7d2325a2c9394d178866ac3e069fd8b6c50be00155ba942 ppc-remove-glibc-dep.patch
598490b4bb45c9f7be46086d25c2b6c601d417c45f11aa519c2290065e7d6e98a7519f9860b823e67a8fd3e6ce3b4728af73ec3a2c66eec32b42fd4ad7cc07f7 disable-failing-test.patch
diff --git a/main/mariadb/gcc13.patch b/main/mariadb/gcc13.patch
new file mode 100644
index 00000000000..e174d40912b
--- /dev/null
+++ b/main/mariadb/gcc13.patch
@@ -0,0 +1,40 @@
+--- a/storage/rocksdb/rocksdb/util/string_util.h
++++ b/storage/rocksdb/rocksdb/util/string_util.h
+@@ -6,6 +6,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <sstream>
+ #include <string>
+ #include <unordered_map>
+--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
++++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
+@@ -8,6 +8,7 @@
+ #pragma once
+ #ifndef ROCKSDB_LITE
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include "rocksdb/status.h"
+--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
++++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
+@@ -5,6 +5,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
++++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
+@@ -6,6 +6,7 @@
+ #pragma once
+
+ #include "rocksdb/rocksdb_namespace.h"
++#include <cstdint>
+
+ struct CompactionIterationStats {
+ // Compaction statistics