summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-dbs
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2023-07-25 11:56:53 +0800
committerKhem Raj <raj.khem@gmail.com>2023-07-24 21:00:47 -0700
commitad4a71137e4a3e4e53bc0492a15ce1025f3f9143 (patch)
treedb783c0ea006300c64c5e08349dea287285b144d /meta-oe/recipes-dbs
parent7e565b5c0c09a9cd7c27eb24f8fb45a746469279 (diff)
downloadmeta-openembedded-ad4a71137e4a3e4e53bc0492a15ce1025f3f9143.tar.gz
mariadb: Upgrade to 10.11.4
Rebase patch 0001-Add-missing-includes-cstdint-and-cstdio.patch to the new version. After the commit [1] introduced in the new version, there is below build failure though uca-dump installed as [2], so copy the uca-dump to the right place to fix the below failure. make[2]: *** No rule to make target 'strings/uca-dump', needed by 'strings/ctype-uca1400data.h'. Stop. [1] https://github.com/MariaDB/server/commit/6f6fa3bec2decb26598bce33d43594aabb25b201 [2] https://git.openembedded.org/meta-openembedded/commit/?id=1f69de300fd3b772830432eedeb2b055396494a6 Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs')
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.2.bb)0
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc8
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch41
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb_10.11.2.bb)0
4 files changed, 15 insertions, 34 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.2.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb
index 578357b480..578357b480 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.2.bb
+++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 57930dae39..2fb0bd7be5 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -25,7 +25,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
25 file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ 25 file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
26 " 26 "
27SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" 27SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
28SRC_URI[sha256sum] = "1c89dee0caed0f68bc2a1d203eb98a123150e6a179f6ee0f1fc0ba3f08dc71dc" 28SRC_URI[sha256sum] = "ce8dac125568cc5f40da74c17212767c92d8faed81066580b526a485a591127d"
29 29
30UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" 30UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
31 31
@@ -110,6 +110,11 @@ OECMAKE_GENERATOR = "Unix Makefiles"
110ARM_INSTRUCTION_SET:armv4 = "arm" 110ARM_INSTRUCTION_SET:armv4 = "arm"
111ARM_INSTRUCTION_SET:armv5 = "arm" 111ARM_INSTRUCTION_SET:armv5 = "arm"
112 112
113do_compile:prepend:class-target () {
114 # remove the buildpath
115 sed -i -e "s:CMAKE_SYSROOT:CMAKE_SYSROOT_PLACE_HOLDER:g" ${S}/libmariadb/mariadb_config/mariadb_config.c.in
116}
117
113do_configure:append() { 118do_configure:append() {
114 # handle distros with different values of ${libexecdir} 119 # handle distros with different values of ${libexecdir}
115 libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'` 120 libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'`
@@ -140,6 +145,7 @@ do_compile:prepend:class-target () {
140 echo "#endif" >>${B}/include/openssl/kssl.h 145 echo "#endif" >>${B}/include/openssl/kssl.h
141 fi 146 fi
142 fi 147 fi
148 install -D ${RECIPE_SYSROOT_NATIVE}/usr/bin/uca-dump ${B}/strings/uca-dump
143} 149}
144 150
145SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess" 151SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess"
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch
index 7c37fef493..12fbd75976 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch
@@ -1,4 +1,4 @@
1From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001 1From 68100b1f2243304289b9a9a35e8fb0e1bb0cf70f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 24 Jan 2023 21:40:43 -0800 3Date: Tue, 24 Jan 2023 21:40:43 -0800
4Subject: [PATCH] Add missing includes <cstdint> and <cstdio> 4Subject: [PATCH] Add missing includes <cstdint> and <cstdio>
@@ -9,17 +9,16 @@ This is needed with GCC 13 and newer [1]
9 9
10Upstream-Status: Pending 10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
12--- 13---
13 .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 + 14 .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 +
14 storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + 15 storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 +
15 .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + 16 .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 +
16 storage/rocksdb/rocksdb/util/slice.cc | 1 + 17 storage/rocksdb/rocksdb/util/slice.cc | 1 +
17 storage/rocksdb/rocksdb/util/string_util.h | 1 + 18 4 files changed, 4 insertions(+)
18 tpool/aio_linux.cc | 1 +
19 6 files changed, 6 insertions(+)
20 19
21diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h 20diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
22index 963c1d8eb49..73487edd96d 100644 21index 963c1d8e..73487edd 100644
23--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h 22--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
24+++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h 23+++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
25@@ -5,6 +5,7 @@ 24@@ -5,6 +5,7 @@
@@ -31,7 +30,7 @@ index 963c1d8eb49..73487edd96d 100644
31 30
32 struct CompactionIterationStats { 31 struct CompactionIterationStats {
33diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h 32diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
34index c7f93b4cfcd..3c2ab80535a 100644 33index c7f93b4c..3c2ab805 100644
35--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h 34--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
36+++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h 35+++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
37@@ -8,6 +8,7 @@ 36@@ -8,6 +8,7 @@
@@ -43,7 +42,7 @@ index c7f93b4cfcd..3c2ab80535a 100644
43 #include <vector> 42 #include <vector>
44 #include "rocksdb/status.h" 43 #include "rocksdb/status.h"
45diff --git a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h 44diff --git a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
46index f356395f329..3215221755d 100644 45index f356395f..32152217 100644
47--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h 46--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
48+++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h 47+++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
49@@ -5,6 +5,7 @@ 48@@ -5,6 +5,7 @@
@@ -55,7 +54,7 @@ index f356395f329..3215221755d 100644
55 #include <vector> 54 #include <vector>
56 55
57diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc 56diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc
58index 6db11cc947a..c26b6a21a57 100644 57index 6db11cc9..c26b6a21 100644
59--- a/storage/rocksdb/rocksdb/util/slice.cc 58--- a/storage/rocksdb/rocksdb/util/slice.cc
60+++ b/storage/rocksdb/rocksdb/util/slice.cc 59+++ b/storage/rocksdb/rocksdb/util/slice.cc
61@@ -8,6 +8,7 @@ 60@@ -8,6 +8,7 @@
@@ -66,30 +65,6 @@ index 6db11cc947a..c26b6a21a57 100644
66 #include "rocksdb/slice_transform.h" 65 #include "rocksdb/slice_transform.h"
67 #include "rocksdb/slice.h" 66 #include "rocksdb/slice.h"
68 #include "util/string_util.h" 67 #include "util/string_util.h"
69diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h
70index a761be66c52..064d059f08f 100644
71--- a/storage/rocksdb/rocksdb/util/string_util.h
72+++ b/storage/rocksdb/rocksdb/util/string_util.h
73@@ -6,6 +6,7 @@
74
75 #pragma once
76
77+#include <cstdint>
78 #include <sstream>
79 #include <string>
80 #include <unordered_map>
81diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc
82index 10234e0e46a..a6adf1af257 100644
83--- a/tpool/aio_linux.cc
84+++ b/tpool/aio_linux.cc
85@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/
86
87 # include <thread>
88 # include <atomic>
89+# include <cstdio>
90 # include <libaio.h>
91 # include <sys/syscall.h>
92
93-- 68--
942.39.1 692.25.1
95 70
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.2.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb
index 87faabfa27..87faabfa27 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb_10.11.2.bb
+++ b/meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb