summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-dbs
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-dbs')
-rw-r--r--meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb5
-rw-r--r--meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb1
-rw-r--r--meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb1
-rw-r--r--meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb2
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb-native_11.4.6.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb)0
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc46
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch52
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch41
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch10
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch170
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch43
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch15
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch7
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch11
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch7
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch9
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch9
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch10
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch13
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start4
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/mysqld.service2
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch43
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/riscv32.patch19
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch11
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch7
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/sys_futex.patch12
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb_11.4.6.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb)0
-rw-r--r--meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch34
-rw-r--r--meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb26
-rw-r--r--meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch26
-rw-r--r--meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch13
-rw-r--r--meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch13
-rw-r--r--meta-oe/recipes-dbs/postgresql/files/0005-postgresql-fix-ptest-failure-of-sysviews.patch18
-rw-r--r--meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch9
-rw-r--r--meta-oe/recipes-dbs/postgresql/postgresql.inc26
-rw-r--r--meta-oe/recipes-dbs/postgresql/postgresql_17.5.bb (renamed from meta-oe/recipes-dbs/postgresql/postgresql_16.3.bb)5
-rw-r--r--meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch45
-rw-r--r--meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb3
-rw-r--r--meta-oe/recipes-dbs/rocksdb/files/0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch42
-rw-r--r--meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch65
-rw-r--r--meta-oe/recipes-dbs/rocksdb/files/0001-checkpoint.h-Add-missing-includes-cstdint.patch41
-rw-r--r--meta-oe/recipes-dbs/rocksdb/files/run-ptest12
-rw-r--r--meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch71
-rw-r--r--meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb (renamed from meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb)30
44 files changed, 535 insertions, 494 deletions
diff --git a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb
index 9506d0e55d..580b92b3b3 100644
--- a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb
+++ b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb
@@ -38,7 +38,7 @@ USERADD_PACKAGES = "${PN}"
38USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" 38USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb"
39 39
40do_install:prepend() { 40do_install:prepend() {
41 test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py 41 test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py
42 test -e ${B}/src/${GO_IMPORT}/build.sh && rm ${B}/src/${GO_IMPORT}/build.sh 42 test -e ${B}/src/${GO_IMPORT}/build.sh && rm ${B}/src/${GO_IMPORT}/build.sh
43 rm -rf ${B}/src/${GO_IMPORT}/Dockerfile* 43 rm -rf ${B}/src/${GO_IMPORT}/Dockerfile*
44 44
@@ -75,3 +75,6 @@ INITSCRIPT_NAME = "influxdb"
75INITSCRIPT_PARAMS = "defaults" 75INITSCRIPT_PARAMS = "defaults"
76 76
77SYSTEMD_SERVICE:${PN} = "influxdb.service" 77SYSTEMD_SERVICE:${PN} = "influxdb.service"
78
79CVE_STATUS[CVE-2019-10329] = "cpe-incorrect: Version does not match and only the Jenkins plugin is affected."
80SKIP_RECIPE[influxdb] ?= "QA Issue: task do_compile has network enabled"
diff --git a/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb b/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb
index 60b486df78..9cefc528ae 100644
--- a/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb
+++ b/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb
@@ -11,7 +11,6 @@ SRC_URI = "gitsm://github.com/google/${BPN}.git;branch=main;protocol=https \
11" 11"
12 12
13SRCREV = "068d5ee1a3ac40dabd00d211d5013af44be55bea" 13SRCREV = "068d5ee1a3ac40dabd00d211d5013af44be55bea"
14S = "${WORKDIR}/git"
15 14
16inherit cmake ptest 15inherit cmake ptest
17PACKAGECONFIG ??= "" 16PACKAGECONFIG ??= ""
diff --git a/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb b/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb
index 7322916499..9623ef7f19 100644
--- a/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb
+++ b/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb
@@ -1,5 +1,4 @@
1require ${PN}.inc 1require ${PN}.inc
2 2
3 3
4SRC_URI[md5sum] = "05e2ceeac4bc85fbe40de8b4b22d9ab3"
5SRC_URI[sha256sum] = "dafb6cdca524c628df832b6dd0bf8fabceb103248edb21762c02d3068fca4503" 4SRC_URI[sha256sum] = "dafb6cdca524c628df832b6dd0bf8fabceb103248edb21762c02d3068fca4503"
diff --git a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb
index b2f1920f6b..065c8559ff 100644
--- a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb
+++ b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb
@@ -18,7 +18,7 @@ SRCREV = "ce201088de95d26fc0da36ba805bf2ddc2ba74ff"
18 18
19inherit ptest 19inherit ptest
20 20
21S = "${WORKDIR}/git/libraries/liblmdb" 21S = "${UNPACKDIR}/${BP}/libraries/liblmdb"
22 22
23do_compile() { 23do_compile() {
24 oe_runmake CC="${CC}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}" XCFLAGS="${CFLAGS}" 24 oe_runmake CC="${CC}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}" XCFLAGS="${CFLAGS}"
diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.6.bb
index 578357b480..578357b480 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb
+++ b/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.6.bb
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 4bfa1c9caa..13e55ebacd 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -17,26 +17,26 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
17 file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ 17 file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \
18 file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \ 18 file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \
19 file://ssize_t.patch \ 19 file://ssize_t.patch \
20 file://mm_malloc.patch \
21 file://sys_futex.patch \ 20 file://sys_futex.patch \
22 file://cross-compiling.patch \ 21 file://cross-compiling.patch \
23 file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ 22 file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
24 file://lfs64.patch \ 23 file://lfs64.patch \
25 file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ 24 file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
26 file://0001-Remove-the-compile_time_assert-lines.patch \ 25 file://0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch \
27 file://0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch \ 26 file://riscv32.patch \
28 " 27 "
29SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" 28SRC_URI[sha256sum] = "1b26c0bb2d025dbfac3b9852d2b7eafda56a171b67ac2e27831ec0414fb7df07"
30SRC_URI[sha256sum] = "5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157"
31 29
32UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" 30UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags"
33 31
34BINCONFIG_GLOB = "mysql_config" 32BINCONFIG_GLOB = "mysql_config"
35 33
36inherit cmake gettext binconfig update-rc.d systemd multilib_script pkgconfig 34inherit cmake gettext binconfig update-rc.d systemd multilib_script multilib_header pkgconfig
37 35
38MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ 36MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \
39 ${PN}-setupdb:${bindir}/mariadb-install-db" 37 ${PN}-setupdb:${bindir}/mariadb-install-db \
38 libmysqlclient-dev:${bindir}/mysql_config \
39 "
40 40
41INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" 41INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb"
42INITSCRIPT_NAME:${PN}-server = "mysqld" 42INITSCRIPT_NAME:${PN}-server = "mysqld"
@@ -63,20 +63,14 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} lz4 openssl"
63EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" 63EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
64 64
65PACKAGECONFIG:class-native = "" 65PACKAGECONFIG:class-native = ""
66PACKAGECONFIG[pam] = "-DPLUGIN_AUTH_PAM=YES,-DPLUGIN_AUTH_PAM=NO,libpam" 66PACKAGECONFIG[pam] = "-DPLUGIN_AUTH_PAM=YES -DINSTALL_PAMDIR=${base_libdir}/security,-DPLUGIN_AUTH_PAM=NO,libpam"
67PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind" 67PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind"
68PACKAGECONFIG[krb5] = ", ,krb5" 68PACKAGECONFIG[krb5] = ", ,krb5"
69PACKAGECONFIG[lz4] = ", ,lz4" 69PACKAGECONFIG[lz4] = ", ,lz4"
70PACKAGECONFIG[openssl] = "-DWITH_SSL='system',-DWITH_SSL='bundled',openssl" 70PACKAGECONFIG[openssl] = "-DWITH_SSL='system',-DWITH_SSL='bundled',openssl"
71 71
72# MariaDB doesn't link properly with gold
73# https://mariadb.atlassian.net/browse/MDEV-5982
74TARGET_CFLAGS += "-fuse-ld=bfd"
75LDFLAGS += " -pthread" 72LDFLAGS += " -pthread"
76 73
77BUILD_CFLAGS += "-fuse-ld=bfd"
78BUILD_CXXFLAGS += "-fuse-ld=bfd"
79
80LDFLAGS:x86:toolchain-clang = "-latomic" 74LDFLAGS:x86:toolchain-clang = "-latomic"
81LDFLAGS:riscv32:toolchain-clang = "-latomic" 75LDFLAGS:riscv32:toolchain-clang = "-latomic"
82 76
@@ -93,11 +87,14 @@ EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \
93 -DINSTALL_DOCDIR:PATH=${datadir}/doc/${BPN} \ 87 -DINSTALL_DOCDIR:PATH=${datadir}/doc/${BPN} \
94 -DINSTALL_LIBDIR:PATH=${baselib} \ 88 -DINSTALL_LIBDIR:PATH=${baselib} \
95 -DINSTALL_PLUGINDIR:PATH=${baselib}/plugin \ 89 -DINSTALL_PLUGINDIR:PATH=${baselib}/plugin \
90 -DINSTALL_PCDIR:PATH=${baselib}/pkgconfig \
96 -DINSTALL_SYSCONFDIR:PATH=${sysconfdir} \ 91 -DINSTALL_SYSCONFDIR:PATH=${sysconfdir} \
97 -DMYSQL_DATADIR:PATH=/var/mysql \ 92 -DMYSQL_DATADIR:PATH=/var/mysql \
98 -DCAT_EXECUTABLE=`which cat` \ 93 -DCAT_EXECUTABLE=`which cat` \
99 -DSTACK_DIRECTION=1 \
100 -DHAVE_SYSTEM_LIBFMT_EXITCODE=0 \ 94 -DHAVE_SYSTEM_LIBFMT_EXITCODE=0 \
95 -DLSTAT_FOLLOWS_SLASHED_SYMLINK_EXITCODE=0 \
96 -DSTAT_EMPTY_STRING_BUG_EXITCODE=0 \
97 -DMASK_LONGDOUBLE_EXITCODE=0 \
101 -DCMAKE_AR:FILEPATH=${AR}" 98 -DCMAKE_AR:FILEPATH=${AR}"
102 99
103 100
@@ -160,6 +157,7 @@ mariadb_sysroot_preprocess () {
160 157
161do_install() { 158do_install() {
162 oe_runmake 'DESTDIR=${D}' install 159 oe_runmake 'DESTDIR=${D}' install
160 oe_multilib_header mysql/mariadb_version.h mysql/server/my_config.h mysql/server/private/config.h
163 161
164 install -d ${D}/${sysconfdir}/init.d 162 install -d ${D}/${sysconfdir}/init.d
165 install -m 0644 ${UNPACKDIR}/my.cnf ${D}/${sysconfdir}/ 163 install -m 0644 ${UNPACKDIR}/my.cnf ${D}/${sysconfdir}/
@@ -182,16 +180,8 @@ do_install() {
182 # mini-benchmark used for Gitlab-CI to run on every commit to catch 180 # mini-benchmark used for Gitlab-CI to run on every commit to catch
183 # if there are severe performance regressions. 181 # if there are severe performance regressions.
184 # remove it to avoid introducing bash dependency 182 # remove it to avoid introducing bash dependency
185 if [ -f ${D}${datadir}/mysql/mini-benchmark ]; then 183 if [ -f ${D}${datadir}/mariadb/mini-benchmark ]; then
186 rm -rf ${D}${datadir}/mysql/mini-benchmark 184 rm -rf ${D}${datadir}/mariadb/mini-benchmark
187 fi
188 if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then
189 pam_so=$(find ${D} -name pam_user_map.so)
190 if [ x"${pam_so}" != x ]; then
191 pam_dir=$(dirname ${pam_so})
192 mv ${pam_dir} ${D}/${libdir}
193 rmdir --ignore-fail-on-non-empty ${pam_dir%security}
194 fi
195 fi 185 fi
196} 186}
197 187
@@ -343,9 +333,9 @@ FILES:${PN}-server = "\
343 ${sbindir}/mysqld \ 333 ${sbindir}/mysqld \
344 ${sbindir}/mariadbd \ 334 ${sbindir}/mariadbd \
345 ${libdir}/plugin/*.so \ 335 ${libdir}/plugin/*.so \
346 ${libdir}/security/*.so \ 336 ${base_libdir}/security/*.so \
347 ${libdir}/plugin/auth_pam_tool_dir/auth_pam_tool \ 337 ${libdir}/plugin/auth_pam_tool_dir/auth_pam_tool \
348 ${datadir}/mysql/ \ 338 ${datadir}/mariadb/ \
349 ${localstatedir}/mysql/ \ 339 ${localstatedir}/mysql/ \
350 ${sysconfdir}/init.d/mysqld \ 340 ${sysconfdir}/init.d/mysqld \
351 ${sysconfdir}/my.cnf \ 341 ${sysconfdir}/my.cnf \
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 f8ccb998be..bc1b992919 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 68100b1f2243304289b9a9a35e8fb0e1bb0cf70f Mon Sep 17 00:00:00 2001 1From ef47f8f41722b90a86ace86f0f509b4775c2f725 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>
@@ -11,27 +11,14 @@ Upstream-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> 12Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
13--- 13---
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 | 2 +-
17 storage/rocksdb/rocksdb/util/slice.cc | 1 + 17 storage/rocksdb/rocksdb/util/string_util.h | 1 +
18 storage/rocksdb/rocksdb/util/string_util.h | 1 + 18 4 files changed, 4 insertions(+), 1 deletion(-)
19 5 files changed, 5 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
22index 963c1d8e..73487edd 100644
23--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
24+++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
25@@ -5,6 +5,7 @@
26
27 #pragma once
28
29+#include <cstdint>
30 #include "rocksdb/rocksdb_namespace.h"
31
32 struct CompactionIterationStats {
33diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h 20diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
34index c7f93b4c..3c2ab805 100644 21index 7fb9d489..f7b4e6f0 100644
35--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h 22--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
36+++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h 23+++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
37@@ -8,6 +8,7 @@ 24@@ -8,6 +8,7 @@
@@ -55,30 +42,29 @@ index f356395f..32152217 100644
55 #include <vector> 42 #include <vector>
56 43
57diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc 44diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc
58index 6db11cc9..c26b6a21 100644 45index 3c3656de..b18d7f5d 100644
59--- a/storage/rocksdb/rocksdb/util/slice.cc 46--- a/storage/rocksdb/rocksdb/util/slice.cc
60+++ b/storage/rocksdb/rocksdb/util/slice.cc 47+++ b/storage/rocksdb/rocksdb/util/slice.cc
61@@ -8,6 +8,7 @@ 48@@ -12,7 +12,7 @@
62 // found in the LICENSE file. See the AUTHORS file for names of contributors. 49 #include <stdio.h>
63 50
64 #include <algorithm> 51 #include <algorithm>
52-
65+#include <cstdint> 53+#include <cstdint>
54 #include "rocksdb/convenience.h"
66 #include "rocksdb/slice_transform.h" 55 #include "rocksdb/slice_transform.h"
67 #include "rocksdb/slice.h" 56 #include "rocksdb/utilities/object_registry.h"
68 #include "util/string_util.h" 57diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h
69 58index 7794dbb0..b480177e 100644
70diff --git a/util/string_util.h b/util/string_util.h
71index 55d106fff02..11178fd1d7b 100644
72--- a/storage/rocksdb/rocksdb/util/string_util.h 59--- a/storage/rocksdb/rocksdb/util/string_util.h
73+++ b/storage/rocksdb/rocksdb/util/string_util.h 60+++ b/storage/rocksdb/rocksdb/util/string_util.h
74@@ -6,6 +6,7 @@ 61@@ -6,6 +6,7 @@
75 62
76 #pragma once 63 #pragma once
77 64
78+#include <cstdint> 65+#include <cstdint>
79 #include <sstream> 66 #include <sstream>
80 #include <string> 67 #include <string>
81 #include <unordered_map> 68 #include <unordered_map>
82-- 69--
832.25.1 702.40.0
84
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch
new file mode 100644
index 0000000000..2a1c74a68c
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch
@@ -0,0 +1,41 @@
1From 0b1ba174bd5148c0675b335fcebde767a56e10bb Mon Sep 17 00:00:00 2001
2From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
3Date: Mon, 2 Dec 2024 02:18:46 +0000
4Subject: [PATCH] Ensure compatibility with ARMv9 by updating .arch directive
5
6The pmem_cvap() function currently uses the '.arch armv8.2-a' directive
7for the 'dc cvap' instruction. This will cause build errors below when
8compiling for ARMv9 systems. Update the '.arch' directive to 'armv9.4-a'
9to ensure compatibility with ARMv9 architectures.
10
11{standard input}: Assembler messages:
12{standard input}:169: Error: selected processor does not support `retaa'
13{standard input}:286: Error: selected processor does not support `retaa'
14make[2]: *** [storage/innobase/CMakeFiles/innobase_embedded.dir/build.make:
151644: storage/innobase/CMakeFiles/innobase_embedded.dir/sync/cache.cc.o]
16Error 1
17
18Upstream-Status: Submitted
19
20Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
21---
22 storage/innobase/sync/cache.cc | 5 +++++
23 1 file changed, 5 insertions(+)
24
25diff --git a/storage/innobase/sync/cache.cc b/storage/innobase/sync/cache.cc
26index 43d642d0..c5e67709 100644
27--- a/storage/innobase/sync/cache.cc
28+++ b/storage/innobase/sync/cache.cc
29@@ -82,7 +82,12 @@ static void pmem_cvap(const void* buf, size_t size)
30 for (uintptr_t u= uintptr_t(buf) & ~(CPU_LEVEL1_DCACHE_LINESIZE),
31 end= uintptr_t(buf) + size;
32 u < end; u+= CPU_LEVEL1_DCACHE_LINESIZE)
33+#if defined __ARM_ARCH && __ARM_ARCH == 9
34+ __asm__ __volatile__(".arch armv9.4-a\n dc cvap, %0" :: "r"(u) : "memory");
35+#else
36 __asm__ __volatile__(".arch armv8.2-a\n dc cvap, %0" :: "r"(u) : "memory");
37+#endif
38+
39 __asm__ __volatile__("dmb ishst" ::: "memory");
40 }
41
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
index d8671b76b0..8105d3d785 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
@@ -1,18 +1,17 @@
1From f15fbdf1244ca9ce01c5507660a86d685ed88bcf Mon Sep 17 00:00:00 2001 1From 2e64c0c22f630cbc301d385e46021853116f9c75 Mon Sep 17 00:00:00 2001
2From: Sumit Garg <sumit.garg@linaro.org> 2From: Sumit Garg <sumit.garg@linaro.org>
3Date: Mon, 21 Mar 2022 15:08:40 +0800 3Date: Mon, 21 Mar 2022 15:08:40 +0800
4Subject: [PATCH] Fix library LZ4 lookup. 4Subject: [PATCH] Fix library LZ4 lookup.
5 5
6Upstream-Status: Pending
6Signed-off-by: Sumit Garg <sumit.garg@linaro.org> 7Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
7Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 8Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
8--- 9---
9Upstream-Status: Pending
10
11 cmake/FindLZ4.cmake | 9 +++++++-- 10 cmake/FindLZ4.cmake | 9 +++++++--
12 1 file changed, 7 insertions(+), 2 deletions(-) 11 1 file changed, 7 insertions(+), 2 deletions(-)
13 12
14diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake 13diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake
15index eebd859..094241c 100644 14index eebd8596..094241ce 100644
16--- a/cmake/FindLZ4.cmake 15--- a/cmake/FindLZ4.cmake
17+++ b/cmake/FindLZ4.cmake 16+++ b/cmake/FindLZ4.cmake
18@@ -1,5 +1,10 @@ 17@@ -1,5 +1,10 @@
@@ -28,6 +27,3 @@ index eebd859..094241c 100644
28 27
29 if(LZ4_INCLUDE_DIRS AND EXISTS "${LZ4_INCLUDE_DIRS}/lz4.h") 28 if(LZ4_INCLUDE_DIRS AND EXISTS "${LZ4_INCLUDE_DIRS}/lz4.h")
30 file(STRINGS "${LZ4_INCLUDE_DIRS}/lz4.h" LZ4_H REGEX "^#define LZ4_VERSION_[MR]") 29 file(STRINGS "${LZ4_INCLUDE_DIRS}/lz4.h" LZ4_H REGEX "^#define LZ4_VERSION_[MR]")
31--
322.25.1
33
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch
deleted file mode 100644
index 3e42535dad..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch
+++ /dev/null
@@ -1,170 +0,0 @@
1From dae52f5916ef59434c93f0b716270f59dd0c3a94 Mon Sep 17 00:00:00 2001
2From: Jan Tojnar <jtojnar@gmail.com>
3Date: Sun, 7 Jan 2024 10:19:54 +0100
4Subject: [PATCH] MDEV-33439 Fix build with libxml2 2.12
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9libxml2 2.12.0 made `xmlGetLastError()` return `const` pointer:
10
11https://gitlab.gnome.org/GNOME/libxml2/-/commit/61034116d0a3c8b295c6137956adc3ae55720711
12
13Clang 16 does not like this:
14
15 error: assigning to 'xmlErrorPtr' (aka '_xmlError *') from 'const xmlError *' (aka 'const _xmlError *') discards qualifiers
16 error: cannot initialize a variable of type 'xmlErrorPtr' (aka '_xmlError *') with an rvalue of type 'const xmlError *' (aka 'const _xmlError *')
17
18Let’s update the variables to `const`.
19For older versions, it will be automatically converted.
20
21But then `xmlResetError(xmlError*)` will not like the `const` pointer:
22
23 error: no matching function for call to 'xmlResetError'
24 note: candidate function not viable: 1st argument ('const xmlError *' (aka 'const _xmlError *')) would lose const qualifier
25
26Let’s replace it with `xmlResetLastError()`.
27
28ALso remove `LIBXMLDOC::Xerr` protected member property.
29It was introduced in 65b0e5455b547a3d574fa77b34cce23ae3bea0a0
30along with the `xmlResetError` calls.
31It does not appear to be used for anything.
32
33Upstream-Status: Backport [https://github.com/MariaDB/server/pull/2983]
34Signed-off-by: Khem Raj <raj.khem@gmail.com>
35---
36 storage/connect/libdoc.cpp | 39 +++++++++++++++++++-------------------
37 1 file changed, 19 insertions(+), 20 deletions(-)
38
39diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp
40index 67f22ce2..ab588dd4 100644
41--- a/storage/connect/libdoc.cpp
42+++ b/storage/connect/libdoc.cpp
43@@ -93,7 +93,6 @@ class LIBXMLDOC : public XMLDOCUMENT {
44 xmlXPathContextPtr Ctxp;
45 xmlXPathObjectPtr Xop;
46 xmlXPathObjectPtr NlXop;
47- xmlErrorPtr Xerr;
48 char *Buf; // Temporary
49 bool Nofreelist;
50 }; // end of class LIBXMLDOC
51@@ -327,7 +326,6 @@ LIBXMLDOC::LIBXMLDOC(char *nsl, char *nsdf, char *enc, PFBLOCK fp)
52 Ctxp = NULL;
53 Xop = NULL;
54 NlXop = NULL;
55- Xerr = NULL;
56 Buf = NULL;
57 Nofreelist = false;
58 } // end of LIBXMLDOC constructor
59@@ -365,8 +363,8 @@ bool LIBXMLDOC::ParseFile(PGLOBAL g, char *fn)
60 Encoding = (char*)Docp->encoding;
61
62 return false;
63- } else if ((Xerr = xmlGetLastError()))
64- xmlResetError(Xerr);
65+ } else if (xmlGetLastError())
66+ xmlResetLastError();
67
68 return true;
69 } // end of ParseFile
70@@ -505,9 +503,9 @@ int LIBXMLDOC::DumpDoc(PGLOBAL g, char *ofn)
71 #if 1
72 // This function does not crash (
73 if (xmlSaveFormatFileEnc((const char *)ofn, Docp, Encoding, 0) < 0) {
74- xmlErrorPtr err = xmlGetLastError();
75+ const xmlError *err = xmlGetLastError();
76 strcpy(g->Message, (err) ? err->message : "Error saving XML doc");
77- xmlResetError(Xerr);
78+ xmlResetLastError();
79 rc = -1;
80 } // endif Save
81 // rc = xmlDocDump(of, Docp);
82@@ -546,8 +544,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
83 if (Nlist) {
84 xmlXPathFreeNodeSet(Nlist);
85
86- if ((Xerr = xmlGetLastError()))
87- xmlResetError(Xerr);
88+ if (xmlGetLastError())
89+ xmlResetLastError();
90
91 Nlist = NULL;
92 } // endif Nlist
93@@ -555,8 +553,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
94 if (Xop) {
95 xmlXPathFreeObject(Xop);
96
97- if ((Xerr = xmlGetLastError()))
98- xmlResetError(Xerr);
99+ if (xmlGetLastError())
100+ xmlResetLastError();
101
102 Xop = NULL;
103 } // endif Xop
104@@ -564,8 +562,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
105 if (NlXop) {
106 xmlXPathFreeObject(NlXop);
107
108- if ((Xerr = xmlGetLastError()))
109- xmlResetError(Xerr);
110+ if (xmlGetLastError())
111+ xmlResetLastError();
112
113 NlXop = NULL;
114 } // endif NlXop
115@@ -573,8 +571,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
116 if (Ctxp) {
117 xmlXPathFreeContext(Ctxp);
118
119- if ((Xerr = xmlGetLastError()))
120- xmlResetError(Xerr);
121+ if (xmlGetLastError())
122+ xmlResetLastError();
123
124 Ctxp = NULL;
125 } // endif Ctxp
126@@ -590,6 +588,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
127 /******************************************************************/
128 xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp)
129 {
130+ const xmlError *xerr;
131 xmlNodeSetPtr nl;
132
133 if (trace(1))
134@@ -649,11 +648,11 @@ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp)
135 } else
136 xmlXPathFreeObject(Xop); // Caused node not found
137
138- if ((Xerr = xmlGetLastError())) {
139- strcpy(g->Message, Xerr->message);
140- xmlResetError(Xerr);
141+ if ((xerr = xmlGetLastError())) {
142+ strcpy(g->Message, xerr->message);
143+ xmlResetLastError();
144 return NULL;
145- } // endif Xerr
146+ } // endif xerr
147
148 } // endif Xop
149
150@@ -1079,7 +1078,7 @@ void XML2NODE::AddText(PGLOBAL g, PCSZ txtp)
151 /******************************************************************/
152 void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp)
153 {
154- xmlErrorPtr xerr;
155+ const xmlError *xerr;
156
157 if (trace(1))
158 htrc("DeleteChild: node=%p\n", dnp);
159@@ -1122,7 +1121,7 @@ void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp)
160 if (trace(1))
161 htrc("DeleteChild: errmsg=%-.256s\n", xerr->message);
162
163- xmlResetError(xerr);
164+ xmlResetLastError();
165 } // end of DeleteChild
166
167 /* -------------------- class XML2NODELIST ---------------------- */
168--
1692.44.0
170
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch
deleted file mode 100644
index 9a6e28297b..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From cc5f1d0759b367265a1a000287e2ec15c31eb518 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Mon, 26 Feb 2024 14:56:02 +0800
4Subject: [PATCH] Remove the compile_time_assert lines
5
6Remove the problematic compile_time_assert lines to fix the below build
7failure on 32-bit arm.
8 In file included from TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/mariadb/10.11.7/mariadb-10.11.7/tests/mysql_client_test.c:38:
9 TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/mariadb/10.11.7/mariadb-10.11.7/tests/mysql_client_fw.c:1438:3: error: 'compile_time_assert' declared as an array with a negative size
10 1438 | compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);
11 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
12
13Upstream-Status: Inappropriate [Upstream will bring the asset back
14 in a new way [1]]
15[1] https://jira.mariadb.org/browse/MDEV-33429
16
17Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
18---
19 tests/mysql_client_fw.c | 8 --------
20 1 file changed, 8 deletions(-)
21
22diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c
23index c9e64678..5c0c7ce2 100644
24--- a/tests/mysql_client_fw.c
25+++ b/tests/mysql_client_fw.c
26@@ -1430,14 +1430,6 @@ int main(int argc, char **argv)
27 tests_to_run[i]= NULL;
28 }
29
30-#ifdef _WIN32
31- /* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */
32- compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728);
33-#else
34- /* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */
35- compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);
36-#endif
37-
38 if (mysql_server_init(embedded_server_arg_count,
39 embedded_server_args,
40 (char**) embedded_server_groups))
41--
422.25.1
43
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch
index aba9b9d966..eddfdaaf77 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch
@@ -1,4 +1,4 @@
1From 0a3222338efc108c831fbdd719a47d35f4b0adcd Mon Sep 17 00:00:00 2001 1From f9f019049a9bb09471e8303d4510afae07f225c8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Aug 2021 06:49:25 +0000 3Date: Wed, 18 Aug 2021 06:49:25 +0000
4Subject: [PATCH] aio_linux: Check if syscall exists before using it 4Subject: [PATCH] aio_linux: Check if syscall exists before using it
@@ -10,19 +10,17 @@ tpool/aio_linux.cc:63:20: error: '__NR_io_getevents' was not declared in this sc
10 | ^~~~~~~~~~~~~~~~~ 10 | ^~~~~~~~~~~~~~~~~
11 | io_getevents 11 | io_getevents
12 12
13Upstream-Staus: Pending 13Upstream-Status: Pending
14Signed-off-by: Khem Raj <raj.khem@gmail.com> 14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15--- 15---
16Upstream-Status: Pending
17
18 tpool/aio_linux.cc | 4 ++++ 16 tpool/aio_linux.cc | 4 ++++
19 1 file changed, 4 insertions(+) 17 1 file changed, 4 insertions(+)
20 18
21diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc 19diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc
22index 4abc213..da75411 100644 20index 507c6b92..a6adf1af 100644
23--- a/tpool/aio_linux.cc 21--- a/tpool/aio_linux.cc
24+++ b/tpool/aio_linux.cc 22+++ b/tpool/aio_linux.cc
25@@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/ 23@@ -59,6 +59,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/
26 */ 24 */
27 static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev) 25 static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev)
28 { 26 {
@@ -30,7 +28,7 @@ index 4abc213..da75411 100644
30 int saved_errno= errno; 28 int saved_errno= errno;
31 int ret= syscall(__NR_io_getevents, reinterpret_cast<long>(ctx), 29 int ret= syscall(__NR_io_getevents, reinterpret_cast<long>(ctx),
32 min_nr, nr, ev, 0); 30 min_nr, nr, ev, 0);
33@@ -67,6 +68,9 @@ static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev) 31@@ -68,6 +69,9 @@ static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev)
34 errno= saved_errno; 32 errno= saved_errno;
35 } 33 }
36 return ret; 34 return ret;
@@ -40,6 +38,3 @@ index 4abc213..da75411 100644
40 } 38 }
41 39
42 40
43--
442.29.2
45
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch
index 0a2eed44f4..bfcd45b64b 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch
@@ -1,4 +1,4 @@
1From d611f78198dee64bb6a05933d200b544e2510b76 Mon Sep 17 00:00:00 2001 1From 3a29c2f7afe10bf0bc0529b5d9ea44866946ac5a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 14 Nov 2020 14:37:13 -0800 3Date: Sat, 14 Nov 2020 14:37:13 -0800
4Subject: [PATCH] innobase: Define __NR_futex if it does not exist 4Subject: [PATCH] innobase: Define __NR_futex if it does not exist
@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
19 1 file changed, 3 insertions(+) 19 1 file changed, 3 insertions(+)
20 20
21diff --git a/storage/innobase/log/log0sync.cc b/storage/innobase/log/log0sync.cc 21diff --git a/storage/innobase/log/log0sync.cc b/storage/innobase/log/log0sync.cc
22index 7799e605..4fab8f74 100644 22index 0de283ca..265ab691 100644
23--- a/storage/innobase/log/log0sync.cc 23--- a/storage/innobase/log/log0sync.cc
24+++ b/storage/innobase/log/log0sync.cc 24+++ b/storage/innobase/log/log0sync.cc
25@@ -66,6 +66,9 @@ Note that if write operation is very fast, a) or b) can be fine as alternative. 25@@ -66,6 +66,9 @@ Note that if write operation is very fast, a) or b) can be fine as alternative.
@@ -32,6 +32,3 @@ index 7799e605..4fab8f74 100644
32 #endif 32 #endif
33 33
34 #include <atomic> 34 #include <atomic>
35--
362.29.2
37
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch
index 456a2bad64..1475bb1a51 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch
@@ -1,4 +1,4 @@
1From f92f657973997df30afdb0032c88ad3a14ead46b Mon Sep 17 00:00:00 2001 1From 360d41c1dd2d28d5102d66179095cedacaf5dc3a Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com> 2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Fri, 23 Sep 2022 15:48:21 +0800 3Date: Fri, 23 Sep 2022 15:48:21 +0800
4Subject: [PATCH] sql/CMakeLists.txt: fix gen_lex_hash not found 4Subject: [PATCH] sql/CMakeLists.txt: fix gen_lex_hash not found
@@ -15,10 +15,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
15 1 file changed, 22 insertions(+), 8 deletions(-) 15 1 file changed, 22 insertions(+), 8 deletions(-)
16 16
17diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt 17diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
18index 241b482..27a3991 100644 18index 0195555e..507136cb 100644
19--- a/sql/CMakeLists.txt 19--- a/sql/CMakeLists.txt
20+++ b/sql/CMakeLists.txt 20+++ b/sql/CMakeLists.txt
21@@ -60,11 +60,18 @@ ${CMAKE_BINARY_DIR}/sql 21@@ -64,11 +64,18 @@ ${CMAKE_BINARY_DIR}/sql
22 ${CMAKE_SOURCE_DIR}/tpool 22 ${CMAKE_SOURCE_DIR}/tpool
23 ) 23 )
24 24
@@ -41,7 +41,7 @@ index 241b482..27a3991 100644
41 41
42 FIND_PACKAGE(BISON 2.4) 42 FIND_PACKAGE(BISON 2.4)
43 43
44@@ -372,11 +379,18 @@ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) 44@@ -405,11 +412,18 @@ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
45 ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) 45 ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
46 ENDIF() 46 ENDIF()
47 47
@@ -64,6 +64,3 @@ index 241b482..27a3991 100644
64 64
65 MYSQL_ADD_EXECUTABLE(mariadb-tzinfo-to-sql tztime.cc) 65 MYSQL_ADD_EXECUTABLE(mariadb-tzinfo-to-sql tztime.cc)
66 SET_TARGET_PROPERTIES(mariadb-tzinfo-to-sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL") 66 SET_TARGET_PROPERTIES(mariadb-tzinfo-to-sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL")
67--
682.25.1
69
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch b/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
index ac94279585..2841a59a73 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
@@ -1,4 +1,4 @@
1From 24e2b0edc2612acefcc48414bb6f0aeb086061a9 Mon Sep 17 00:00:00 2001 1From c24181245bc502a384635d7f7f48f12863f84c2f Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com> 2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Tue, 26 Feb 2019 23:57:06 -0800 3Date: Tue, 26 Feb 2019 23:57:06 -0800
4Subject: [PATCH] configure.cmake: fix valgrind 4Subject: [PATCH] configure.cmake: fix valgrind
@@ -16,16 +16,15 @@ Upstream-Status: Inappropriate [oe specific]
16 16
17Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 17Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
18Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 18Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
19
20--- 19---
21 configure.cmake | 5 ++--- 20 configure.cmake | 5 ++---
22 1 file changed, 2 insertions(+), 3 deletions(-) 21 1 file changed, 2 insertions(+), 3 deletions(-)
23 22
24diff --git a/configure.cmake b/configure.cmake 23diff --git a/configure.cmake b/configure.cmake
25index 3cfc4b31..d017b3b3 100644 24index 61f30a75..3e730082 100644
26--- a/configure.cmake 25--- a/configure.cmake
27+++ b/configure.cmake 26+++ b/configure.cmake
28@@ -930,10 +930,9 @@ HAVE_GCC_C11_ATOMICS) 27@@ -881,10 +881,9 @@ ENDIF()
29 28
30 IF(WITH_VALGRIND) 29 IF(WITH_VALGRIND)
31 SET(HAVE_valgrind 1) 30 SET(HAVE_valgrind 1)
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch b/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch
index d0d6e3c730..dc34c07d31 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch
@@ -1,4 +1,4 @@
1From 80be37351d995654f86b838f6b5ed47e8a90261b Mon Sep 17 00:00:00 2001 1From b6d8dbb7e930f5caa9e3e3c71706b0cf9eea7bb3 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com> 2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Fri, 23 Sep 2022 12:05:17 +0800 3Date: Fri, 23 Sep 2022 12:05:17 +0800
4Subject: [PATCH] CMakeLists.txt: not include import_executables.cmake 4Subject: [PATCH] CMakeLists.txt: not include import_executables.cmake
@@ -14,10 +14,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
14 1 file changed, 5 deletions(-) 14 1 file changed, 5 deletions(-)
15 15
16diff --git a/CMakeLists.txt b/CMakeLists.txt 16diff --git a/CMakeLists.txt b/CMakeLists.txt
17index f9e2b1b..34924ba 100644 17index 3828420c..ee38615a 100644
18--- a/CMakeLists.txt 18--- a/CMakeLists.txt
19+++ b/CMakeLists.txt 19+++ b/CMakeLists.txt
20@@ -394,11 +394,6 @@ CHECK_LIBFMT() 20@@ -428,11 +428,6 @@ CHECK_LIBFMT()
21 ADD_SUBDIRECTORY(tpool) 21 ADD_SUBDIRECTORY(tpool)
22 CHECK_SYSTEMD() 22 CHECK_SYSTEMD()
23 23
@@ -29,6 +29,3 @@ index f9e2b1b..34924ba 100644
29 # 29 #
30 # Setup maintainer mode options. Platform checks are 30 # Setup maintainer mode options. Platform checks are
31 # not run with the warning options as to not perturb fragile checks 31 # not run with the warning options as to not perturb fragile checks
32--
332.25.1
34
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch
index 05b0cf8ff7..39b7fad983 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch
@@ -1,4 +1,4 @@
1From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001 1From af4247cd24eab2d728fb3592f6e125ef5290361b Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com> 2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Thu, 9 Apr 2020 14:07:19 +0800 3Date: Thu, 9 Apr 2020 14:07:19 +0800
4Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm 4Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
@@ -16,10 +16,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
16 1 file changed, 3 insertions(+) 16 1 file changed, 3 insertions(+)
17 17
18diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake 18diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
19index d7895b0..3bcd52a 100644 19index e89dbfc0..acc6b48e 100644
20--- a/storage/rocksdb/build_rocksdb.cmake 20--- a/storage/rocksdb/build_rocksdb.cmake
21+++ b/storage/rocksdb/build_rocksdb.cmake 21+++ b/storage/rocksdb/build_rocksdb.cmake
22@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc) 22@@ -490,6 +490,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
23 23
24 ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES}) 24 ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
25 target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) 25 target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
@@ -29,6 +29,3 @@ index d7895b0..3bcd52a 100644
29 IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") 29 IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
30 set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error") 30 set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
31 endif() 31 endif()
32--
332.7.4
34
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch b/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch
index 7a685a6521..d53eb99e4c 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch
@@ -1,5 +1,15 @@
1From 24667f728fabe141a92d4de828ab24d9fe953b08 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 25 Dec 2022 19:23:17 -0800
4Subject: [PATCH] mariadb: Alias lseek64/open64/ftruncate64 on musl systems
5
1Upstream-Status: Pending 6Upstream-Status: Pending
7---
8 storage/connect/os.h | 4 +++-
9 1 file changed, 3 insertions(+), 1 deletion(-)
2 10
11diff --git a/storage/connect/os.h b/storage/connect/os.h
12index 7d0d5cab..10da630f 100644
3--- a/storage/connect/os.h 13--- a/storage/connect/os.h
4+++ b/storage/connect/os.h 14+++ b/storage/connect/os.h
5@@ -2,13 +2,15 @@ 15@@ -2,13 +2,15 @@
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch b/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch
deleted file mode 100644
index 6aa6c84882..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Upstream-Status: Pending
2
3--- a/storage/rocksdb/rocksdb/port/jemalloc_helper.h
4+++ b/storage/rocksdb/rocksdb/port/jemalloc_helper.h
5@@ -5,7 +5,7 @@
6
7 #pragma once
8
9-#if defined(__clang__)
10+#if defined(__clang__) && defined(__GLIBC__)
11 // glibc's `posix_memalign()` declaration specifies `throw()` while clang's
12 // declaration does not. There is a hack in clang to make its re-declaration
13 // compatible with glibc's if they are declared consecutively. That hack breaks
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start b/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start
index 189c02021d..b7ae09a4f7 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start
+++ b/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start
@@ -34,7 +34,7 @@ install_db () {
34 [ -d "$datadir/mysql" ] && exit 0 34 [ -d "$datadir/mysql" ] && exit 0
35 35
36 # Create initial db 36 # Create initial db
37 /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql 37 /usr/bin/mariadb-install-db --rpm --datadir="$datadir" --user=mysql
38 exit 0 38 exit 0
39} 39}
40 40
@@ -51,7 +51,7 @@ pinger () {
51 51
52 while /bin/true ; do 52 while /bin/true ; do
53 sleep 1 53 sleep 1
54 mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break 54 mariadb-admin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break
55 done 55 done
56 exit 0 56 exit 0
57} 57}
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service b/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service
index d88361703d..9c47fede1c 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service
+++ b/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service
@@ -13,7 +13,7 @@ Group=mysql
13PermissionsStartOnly=true 13PermissionsStartOnly=true
14 14
15# Start main service 15# Start main service
16ExecStart=@BINDIR@/mysqld_safe --basedir=@PREFIX@ 16ExecStart=@BINDIR@/mariadbd-safe --basedir=@PREFIX@
17 17
18# Don't signal startup success before a ping works 18# Don't signal startup success before a ping works
19ExecStartPost=@BINDIR@/mysql-systemd-start post 19ExecStartPost=@BINDIR@/mysql-systemd-start post
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch b/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch
deleted file mode 100644
index 3787b74ad1..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1Upstream-Status: Pending
2
3Remove glibc specific function dependencies
4
5Sourced from: https://git.alpinelinux.org/aports/tree/main/mariadb/ppc-remove-glibc-dep.patch
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8diff --git a/include/my_cpu.h b/include/my_cpu.h
9index f2e26fca..94599b74 100644
10--- a/include/my_cpu.h
11+++ b/include/my_cpu.h
12@@ -24,17 +24,16 @@
13 */
14
15 #ifdef _ARCH_PWR8
16-#include <sys/platform/ppc.h>
17 /* Very low priority */
18-#define HMT_very_low() __ppc_set_ppr_very_low()
19+#define HMT_very_low() asm volatile("or 31,31,31")
20 /* Low priority */
21-#define HMT_low() __ppc_set_ppr_low()
22+#define HMT_low() asm volatile ("or 1,1,1")
23 /* Medium low priority */
24-#define HMT_medium_low() __ppc_set_ppr_med_low()
25+#define HMT_medium_low() asm volatile ("or 6,6,6")
26 /* Medium priority */
27-#define HMT_medium() __ppc_set_ppr_med()
28+#define HMT_medium() asm volatile ("or 2,2,2")
29 /* Medium high priority */
30-#define HMT_medium_high() __ppc_set_ppr_med_high()
31+#define HMT_medium_high() asm volatile("or 5,5,5")
32 /* High priority */
33 #define HMT_high() asm volatile("or 3,3,3")
34 #else
35@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
36 __asm__ __volatile__ ("pause");
37 #endif
38 #elif defined(_ARCH_PWR8)
39- __ppc_get_timebase();
40+ __builtin_ppc_get_timebase();
41 #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
42 /* Mainly, prevent the compiler from optimizing away delay loops */
43 __asm__ __volatile__ ("":::"memory");
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/riscv32.patch b/meta-oe/recipes-dbs/mysql/mariadb/riscv32.patch
new file mode 100644
index 0000000000..24b86584e3
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/riscv32.patch
@@ -0,0 +1,19 @@
1Do not use static_cast in C sources
2
3C compiler does not recognise static_cast which is a C++ keyword
4and bails out compiling mysys/my_rdtsc.c, use traditional typecast
5instead
6
7Upstream-Status: Submitted [https://github.com/MariaDB/server/pull/1981/files#r2032207090]
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9--- a/include/my_rdtsc.h
10+++ b/include/my_rdtsc.h
11@@ -226,7 +226,7 @@ static inline ulonglong my_timer_cycles(
12 "sub %0, zero, %0\n"
13 "and %1, %1, %0\n"
14 : "=r"(result_hi0), "=r"(result_lo), "=r"(result_hi1));
15- return (static_cast<ulonglong>(result_hi1) << 32) | result_lo;
16+ return ((ulonglong)result_hi1 << 32) | result_lo;
17 # else
18 ulonglong result;
19 __asm __volatile__("rdtime %0" : "=r"(result));
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch b/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch
index 4e499d4137..819b65f041 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch
@@ -1,7 +1,16 @@
1ssize_t comes from sys/types.h therefore include it 1From cfa843c91a036d0926c76c6dec6fd2a1f38e4843 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 31 May 2021 21:55:00 -0700
4Subject: [PATCH] ssize_t comes from sys/types.h therefore include it
2 5
3Upstream-Status: Pending 6Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 wsrep-lib/include/wsrep/gtid.hpp | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/wsrep-lib/include/wsrep/gtid.hpp b/wsrep-lib/include/wsrep/gtid.hpp
13index 0d49c58d..d61a6585 100644
5--- a/wsrep-lib/include/wsrep/gtid.hpp 14--- a/wsrep-lib/include/wsrep/gtid.hpp
6+++ b/wsrep-lib/include/wsrep/gtid.hpp 15+++ b/wsrep-lib/include/wsrep/gtid.hpp
7@@ -25,7 +25,7 @@ 16@@ -25,7 +25,7 @@
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch b/meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch
index 233d9e6af6..30c9e2452a 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch
@@ -1,4 +1,4 @@
1From 4ac5b555d058d4d489f25a3806a787b7b2465d09 Mon Sep 17 00:00:00 2001 1From 34713c3bba68cb94b373b750c1c8fcc0b04b2c45 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com> 2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 27 Feb 2019 22:41:26 -0800 3Date: Wed, 27 Feb 2019 22:41:26 -0800
4Subject: [PATCH] support-files/CMakeLists.txt: fix do_populate_sysroot issue 4Subject: [PATCH] support-files/CMakeLists.txt: fix do_populate_sysroot issue
@@ -10,16 +10,15 @@ ERROR: mariadb-native-10.3.13-r0 do_populate_sysroot: sstate found an absolute p
10Upstream-Status: Inappropriate [oe build specific] 10Upstream-Status: Inappropriate [oe build specific]
11 11
12Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 12Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
13
14--- 13---
15 support-files/CMakeLists.txt | 7 ------- 14 support-files/CMakeLists.txt | 7 -------
16 1 file changed, 7 deletions(-) 15 1 file changed, 7 deletions(-)
17 16
18diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt 17diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
19index b5767432..56733de1 100644 18index ee1d420e..a99c0605 100644
20--- a/support-files/CMakeLists.txt 19--- a/support-files/CMakeLists.txt
21+++ b/support-files/CMakeLists.txt 20+++ b/support-files/CMakeLists.txt
22@@ -165,12 +165,5 @@ IF(UNIX) 21@@ -245,12 +245,5 @@ IF(UNIX AND NOT WITHOUT_SERVER)
23 INSTALL(FILES rpm/enable_encryption.preset DESTINATION ${INSTALL_SYSCONF2DIR} 22 INSTALL(FILES rpm/enable_encryption.preset DESTINATION ${INSTALL_SYSCONF2DIR}
24 COMPONENT IniFiles) 23 COMPONENT IniFiles)
25 ENDIF() 24 ENDIF()
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/sys_futex.patch b/meta-oe/recipes-dbs/mysql/mariadb/sys_futex.patch
index 3244ab8da2..3840472213 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/sys_futex.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/sys_futex.patch
@@ -1,14 +1,22 @@
1Use SYS_futex for syscall 1From 166811dfcfc61e7646275aa993d7d7f4b02d1f49 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 3 Apr 2021 12:40:14 -0700
4Subject: [PATCH] Use SYS_futex for syscall
2 5
3glibc defines SYS_futex and on newer 32bit CPUs like RISCV-32, arc there 6glibc defines SYS_futex and on newer 32bit CPUs like RISCV-32, arc there
4is no 32bit time_t therefore define SYS_futex in terms of SYS_futex_time64 7is no 32bit time_t therefore define SYS_futex in terms of SYS_futex_time64
5 8
6Upstream-Status: Pending 9Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 storage/innobase/sync/srw_lock.cc | 6 ++++++
13 1 file changed, 6 insertions(+)
8 14
15diff --git a/storage/innobase/sync/srw_lock.cc b/storage/innobase/sync/srw_lock.cc
16index 28b586de..3ee71142 100644
9--- a/storage/innobase/sync/srw_lock.cc 17--- a/storage/innobase/sync/srw_lock.cc
10+++ b/storage/innobase/sync/srw_lock.cc 18+++ b/storage/innobase/sync/srw_lock.cc
11@@ -210,6 +210,12 @@ void ssux_lock_low::wake() { WakeByAddre 19@@ -226,6 +226,12 @@ void ssux_lock_impl<spinloop>::wake() noexcept { WakeByAddressSingle(&readers);
12 # ifdef __linux__ 20 # ifdef __linux__
13 # include <linux/futex.h> 21 # include <linux/futex.h>
14 # include <sys/syscall.h> 22 # include <sys/syscall.h>
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb b/meta-oe/recipes-dbs/mysql/mariadb_11.4.6.bb
index b1d1355e2b..b1d1355e2b 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb
+++ b/meta-oe/recipes-dbs/mysql/mariadb_11.4.6.bb
diff --git a/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch b/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch
deleted file mode 100644
index 173241ea5c..0000000000
--- a/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 45436592aa64308b2ab46f84c6107c6d7de0a3ec Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 6 Mar 2019 00:16:17 -0800
4Subject: [PATCH] _mysql.c: fix compilation with MariaDB 10.3.13
5
6Use standard API function MYSQL_OPT_RECONNECT
7instead of direct modification of internal structures
8which does not work for MariaDB.
9
10Upstream-Status: Pending
11
12Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
13---
14 _mysql.c | 9 ++++++++-
15 1 file changed, 8 insertions(+), 1 deletion(-)
16
17--- a/_mysql.c
18+++ b/_mysql.c
19@@ -2002,7 +2002,14 @@ _mysql_ConnectionObject_ping(
20 int r, reconnect = -1;
21 if (!PyArg_ParseTuple(args, "|I", &reconnect)) return NULL;
22 check_connection(self);
23- if ( reconnect != -1 ) self->connection.reconnect = reconnect;
24+ if ( reconnect != -1 ) {
25+#if MYSQL_VERSION_ID >= 50013
26+ my_bool recon = reconnect;
27+ mysql_options(&self->connection, MYSQL_OPT_RECONNECT, &recon);
28+#else
29+ self->connection.reconnect = reconnect;
30+#endif
31+ }
32 Py_BEGIN_ALLOW_THREADS
33 r = mysql_ping(&(self->connection));
34 Py_END_ALLOW_THREADS
diff --git a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
deleted file mode 100644
index 15f6b6fb9a..0000000000
--- a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1SUMMARY = "Python interface to MySQL"
2HOMEPAGE = "https://github.com/farcepest/MySQLdb1"
3SECTION = "devel/python"
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263"
6
7DEPENDS = "mysql5"
8
9SRCNAME = "MySQL-python"
10
11SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip \
12 file://0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch \
13"
14SRC_URI[md5sum] = "654f75b302db6ed8dc5a898c625e030c"
15SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74"
16
17S = "${WORKDIR}/${SRCNAME}-${PV}"
18
19SKIP_RECIPE[mysql-python] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}"
20
21inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "setuptools", "", d)}
22
23python() {
24 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
25 raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
26}
diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch b/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch
new file mode 100644
index 0000000000..89a509087f
--- /dev/null
+++ b/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch
@@ -0,0 +1,26 @@
1From f0d8240dbf594e6dfab31fd7d70ce340ac365a65 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 3 Nov 2024 15:50:50 -0800
4Subject: [PATCH] tcl.m4: Recognize tclsh9
5
6Add missing support to recognize tclsh9 as supported
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 config/tcl.m4 | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/config/tcl.m4 b/config/tcl.m4
15index 9de31a5..568fd45 100644
16--- a/config/tcl.m4
17+++ b/config/tcl.m4
18@@ -4,7 +4,7 @@
19
20
21 AC_DEFUN([PGAC_PATH_TCLSH],
22-[PGAC_PATH_PROGS(TCLSH, [tclsh tcl tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84])
23+[PGAC_PATH_PROGS(TCLSH, [tclsh tcl tclsh9.0 tclsh90 tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84])
24 AC_ARG_VAR(TCLSH, [Tcl interpreter program (tclsh)])dnl
25 if test x"$TCLSH" = x""; then
26 AC_MSG_ERROR([Tcl shell not found])
diff --git a/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch b/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch
index 9df4d073ff..4382741da9 100644
--- a/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch
+++ b/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch
@@ -1,7 +1,7 @@
1From 30b1b37d309f67ba6d58f2197bd917107bc7d56c Mon Sep 17 00:00:00 2001 1From 84febaf9330fe99802f75bcd0606ac7d86c35b25 Mon Sep 17 00:00:00 2001
2From: Yi Fan Yu <yifan.yu@windriver.com> 2From: Yi Fan Yu <yifan.yu@windriver.com>
3Date: Fri, 5 Feb 2021 17:15:42 -0500 3Date: Fri, 5 Feb 2021 17:15:42 -0500
4Subject: [PATCH 3/5] configure.ac: bypass autoconf 2.69 version check 4Subject: [PATCH] configure.ac: bypass autoconf 2.69 version check
5 5
6for upgrade to autoconf 2.71 6for upgrade to autoconf 2.71
7 7
@@ -13,20 +13,17 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
13 1 file changed, 4 deletions(-) 13 1 file changed, 4 deletions(-)
14 14
15diff --git a/configure.ac b/configure.ac 15diff --git a/configure.ac b/configure.ac
16index 401ce30..27f382d 100644 16index 493d5cd..f0fa973 100644
17--- a/configure.ac 17--- a/configure.ac
18+++ b/configure.ac 18+++ b/configure.ac
19@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros 19@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
20 20
21 AC_INIT([PostgreSQL], [16.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) 21 AC_INIT([PostgreSQL], [17.5], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
22 22
23-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. 23-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
24-Untested combinations of 'autoconf' and PostgreSQL versions are not 24-Untested combinations of 'autoconf' and PostgreSQL versions are not
25-recommended. You can remove the check from 'configure.ac' but it is then 25-recommended. You can remove the check from 'configure.ac' but it is then
26-your responsibility whether the result works or not.])]) 26-your responsibility whether the result works or not.])])
27 AC_COPYRIGHT([Copyright (c) 1996-2023, PostgreSQL Global Development Group]) 27 AC_COPYRIGHT([Copyright (c) 1996-2024, PostgreSQL Global Development Group])
28 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) 28 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
29 AC_CONFIG_AUX_DIR(config) 29 AC_CONFIG_AUX_DIR(config)
30--
312.25.1
32
diff --git a/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch b/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch
index ff0582ab80..d94f028036 100644
--- a/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch
+++ b/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch
@@ -1,7 +1,7 @@
1From 5be3ffdf767c1efcbfd2d1be87aa83f2e37e348e Mon Sep 17 00:00:00 2001 1From 62733bdc9346651637d9e5ac7cbf8d7311ef5d97 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com> 2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Mon, 1 Aug 2022 15:44:38 +0800 3Date: Mon, 1 Aug 2022 15:44:38 +0800
4Subject: [PATCH 4/5] config_info.c: not expose build info 4Subject: [PATCH] config_info.c: not expose build info
5 5
6Don't collect the build information to fix the buildpaths issue. 6Don't collect the build information to fix the buildpaths issue.
7 7
@@ -14,10 +14,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
14 2 files changed, 2 insertions(+), 70 deletions(-) 14 2 files changed, 2 insertions(+), 70 deletions(-)
15 15
16diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
17index 27f382d..3dd6bb1 100644 17index f0fa973..8ccd8bc 100644
18--- a/configure.ac 18--- a/configure.ac
19+++ b/configure.ac 19+++ b/configure.ac
20@@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 1996-2023, PostgreSQL Global Development Group]) 20@@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 1996-2024, PostgreSQL Global Development Group])
21 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) 21 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
22 AC_CONFIG_AUX_DIR(config) 22 AC_CONFIG_AUX_DIR(config)
23 AC_PREFIX_DEFAULT(/usr/local/pgsql) 23 AC_PREFIX_DEFAULT(/usr/local/pgsql)
@@ -27,7 +27,7 @@ index 27f382d..3dd6bb1 100644
27 [PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`] 27 [PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`]
28 [PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`] 28 [PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`]
29diff --git a/src/common/config_info.c b/src/common/config_info.c 29diff --git a/src/common/config_info.c b/src/common/config_info.c
30index 09e78a6..86e4230 100644 30index 89c1ccb..a2206de 100644
31--- a/src/common/config_info.c 31--- a/src/common/config_info.c
32+++ b/src/common/config_info.c 32+++ b/src/common/config_info.c
33@@ -38,7 +38,7 @@ get_configdata(const char *my_exec_path, size_t *configdata_len) 33@@ -38,7 +38,7 @@ get_configdata(const char *my_exec_path, size_t *configdata_len)
@@ -114,6 +114,3 @@ index 09e78a6..86e4230 100644
114 configdata[i].name = pstrdup("VERSION"); 114 configdata[i].name = pstrdup("VERSION");
115 configdata[i].setting = pstrdup("PostgreSQL " PG_VERSION); 115 configdata[i].setting = pstrdup("PostgreSQL " PG_VERSION);
116 i++; 116 i++;
117--
1182.25.1
119
diff --git a/meta-oe/recipes-dbs/postgresql/files/0005-postgresql-fix-ptest-failure-of-sysviews.patch b/meta-oe/recipes-dbs/postgresql/files/0005-postgresql-fix-ptest-failure-of-sysviews.patch
index af36da4927..8219fc80e9 100644
--- a/meta-oe/recipes-dbs/postgresql/files/0005-postgresql-fix-ptest-failure-of-sysviews.patch
+++ b/meta-oe/recipes-dbs/postgresql/files/0005-postgresql-fix-ptest-failure-of-sysviews.patch
@@ -1,7 +1,7 @@
1From 1a8b94140988d2ee5ff987b0bb3e7c3e936b8c01 Mon Sep 17 00:00:00 2001 1From d1fb37569b5a8c21968f69164e8bc6e4bb0185eb Mon Sep 17 00:00:00 2001
2From: Manoj Saun <manojsingh.saun@windriver.com> 2From: Manoj Saun <manojsingh.saun@windriver.com>
3Date: Wed, 22 Mar 2023 08:07:26 +0000 3Date: Wed, 22 Mar 2023 08:07:26 +0000
4Subject: [PATCH 5/5] postgresql: fix ptest failure of sysviews 4Subject: [PATCH] postgresql: fix ptest failure of sysviews
5 5
6The patch "0001-config_info.c-not-expose-build-info.patch" hides the debug info 6The patch "0001-config_info.c-not-expose-build-info.patch" hides the debug info
7in pg_config table which reduces the count of rows from pg_config and leads to 7in pg_config table which reduces the count of rows from pg_config and leads to
@@ -19,12 +19,12 @@ Signed-off-by: Manoj Saun <manojsingh.saun@windriver.com>
19 2 files changed, 2 insertions(+), 2 deletions(-) 19 2 files changed, 2 insertions(+), 2 deletions(-)
20 20
21diff --git a/src/test/regress/expected/sysviews.out b/src/test/regress/expected/sysviews.out 21diff --git a/src/test/regress/expected/sysviews.out b/src/test/regress/expected/sysviews.out
22index 001c6e7..8256898 100644 22index 2176a54..a84bc27 100644
23--- a/src/test/regress/expected/sysviews.out 23--- a/src/test/regress/expected/sysviews.out
24+++ b/src/test/regress/expected/sysviews.out 24+++ b/src/test/regress/expected/sysviews.out
25@@ -29,7 +29,7 @@ select name, ident, parent, level, total_bytes >= free_bytes 25@@ -52,7 +52,7 @@ from pg_backend_memory_contexts where name = 'Caller tuples';
26 (1 row)
27 26
27 rollback;
28 -- At introduction, pg_config had 23 entries; it may grow 28 -- At introduction, pg_config had 23 entries; it may grow
29-select count(*) > 20 as ok from pg_config; 29-select count(*) > 20 as ok from pg_config;
30+select count(*) > 13 as ok from pg_config; 30+select count(*) > 13 as ok from pg_config;
@@ -32,11 +32,11 @@ index 001c6e7..8256898 100644
32 ---- 32 ----
33 t 33 t
34diff --git a/src/test/regress/sql/sysviews.sql b/src/test/regress/sql/sysviews.sql 34diff --git a/src/test/regress/sql/sysviews.sql b/src/test/regress/sql/sysviews.sql
35index 351e469..84c113e 100644 35index b047fb5..d1e3999 100644
36--- a/src/test/regress/sql/sysviews.sql 36--- a/src/test/regress/sql/sysviews.sql
37+++ b/src/test/regress/sql/sysviews.sql 37+++ b/src/test/regress/sql/sysviews.sql
38@@ -18,7 +18,7 @@ select name, ident, parent, level, total_bytes >= free_bytes 38@@ -33,7 +33,7 @@ from pg_backend_memory_contexts where name = 'Caller tuples';
39 from pg_backend_memory_contexts where level = 0; 39 rollback;
40 40
41 -- At introduction, pg_config had 23 entries; it may grow 41 -- At introduction, pg_config had 23 entries; it may grow
42-select count(*) > 20 as ok from pg_config; 42-select count(*) > 20 as ok from pg_config;
@@ -45,5 +45,5 @@ index 351e469..84c113e 100644
45 -- We expect no cursors in this test; see also portals.sql 45 -- We expect no cursors in this test; see also portals.sql
46 select count(*) = 0 as ok from pg_cursors; 46 select count(*) = 0 as ok from pg_cursors;
47-- 47--
482.25.1 482.34.1
49 49
diff --git a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch
index 1f735f322b..a2f0500a8c 100644
--- a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch
+++ b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch
@@ -1,4 +1,4 @@
1From 56b830edecff1cac5f8a8a956e7a7eeef2aa7c17 Mon Sep 17 00:00:00 2001 1From 1a9416bae71aa935797add3fa11407732ad010c0 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 27 Nov 2018 13:25:15 +0800 3Date: Tue, 27 Nov 2018 13:25:15 +0800
4Subject: [PATCH] not check libperl under cross compiling 4Subject: [PATCH] not check libperl under cross compiling
@@ -20,10 +20,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
20 1 file changed, 1 insertion(+), 1 deletion(-) 20 1 file changed, 1 insertion(+), 1 deletion(-)
21 21
22diff --git a/configure.ac b/configure.ac 22diff --git a/configure.ac b/configure.ac
23index fba79ee..7170f26 100644 23index f398184..493d5cd 100644
24--- a/configure.ac 24--- a/configure.ac
25+++ b/configure.ac 25+++ b/configure.ac
26@@ -2297,7 +2297,7 @@ Use --without-tcl to disable building PL/Tcl.]) 26@@ -2336,7 +2336,7 @@ Use --without-tcl to disable building PL/Tcl.])
27 fi 27 fi
28 28
29 # check for <perl.h> 29 # check for <perl.h>
@@ -32,6 +32,3 @@ index fba79ee..7170f26 100644
32 ac_save_CPPFLAGS=$CPPFLAGS 32 ac_save_CPPFLAGS=$CPPFLAGS
33 CPPFLAGS="$CPPFLAGS $perl_includespec" 33 CPPFLAGS="$CPPFLAGS $perl_includespec"
34 AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])], 34 AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])],
35--
362.34.1
37
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc
index 2dd7dd6fda..040b3d5e34 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql.inc
+++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc
@@ -19,7 +19,7 @@ DESCRIPTION = "\
19" 19"
20HOMEPAGE = "http://www.postgresql.com" 20HOMEPAGE = "http://www.postgresql.com"
21LICENSE = "0BSD" 21LICENSE = "0BSD"
22DEPENDS = "libnsl2 readline tzcode-native" 22DEPENDS = "libnsl2 tzcode-native perl bison-native"
23 23
24ARM_INSTRUCTION_SET = "arm" 24ARM_INSTRUCTION_SET = "arm"
25 25
@@ -37,9 +37,9 @@ LEAD_SONAME = "libpq.so"
37export LDFLAGS_SL = "${LDFLAGS}" 37export LDFLAGS_SL = "${LDFLAGS}"
38export LDFLAGS_EX_BE = "-Wl,--export-dynamic" 38export LDFLAGS_EX_BE = "-Wl,--export-dynamic"
39 39
40inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext cpan-base multilib_header 40inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext perl-version multilib_header
41 41
42CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" 42CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR}"
43 43
44SYSTEMD_SERVICE:${PN} = "postgresql.service" 44SYSTEMD_SERVICE:${PN} = "postgresql.service"
45SYSTEMD_AUTO_ENABLE:${PN} = "disable" 45SYSTEMD_AUTO_ENABLE:${PN} = "disable"
@@ -55,7 +55,7 @@ pkg_postinst:${PN} () {
55 55
56PACKAGECONFIG ??= " \ 56PACKAGECONFIG ??= " \
57 ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \ 57 ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \
58 openssl python uuid libxml tcl perl zlib icu \ 58 openssl python uuid libxml perl zlib icu readline \
59" 59"
60PACKAGECONFIG[tcl] = "--with-tcl --with-tclconfig=${STAGING_BINDIR_CROSS},--without-tcl,tcl tcl-native," 60PACKAGECONFIG[tcl] = "--with-tcl --with-tclconfig=${STAGING_BINDIR_CROSS},--without-tcl,tcl tcl-native,"
61PACKAGECONFIG[perl] = "--with-perl,--without-perl,perl,perl" 61PACKAGECONFIG[perl] = "--with-perl,--without-perl,perl,perl"
@@ -71,8 +71,9 @@ PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
71PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4" 71PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4"
72PACKAGECONFIG[openssl] = "--with-ssl=openssl,ac_cv_file__dev_urandom=yes,openssl" 72PACKAGECONFIG[openssl] = "--with-ssl=openssl,ac_cv_file__dev_urandom=yes,openssl"
73PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu,icu" 73PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu,icu"
74PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
74 75
75EXTRA_OECONF += "--enable-thread-safety --disable-rpath \ 76EXTRA_OECONF += "--disable-rpath \
76 --datadir=${datadir}/${BPN} \ 77 --datadir=${datadir}/${BPN} \
77 --sysconfdir=${sysconfdir}/${BPN} \ 78 --sysconfdir=${sysconfdir}/${BPN} \
78" 79"
@@ -122,10 +123,18 @@ python populate_packages:prepend() {
122 123
123} 124}
124 125
126# Same as the function in cpan-base.bbclass (but without the perl RDEPENDS)
127def is_target(d):
128 if not bb.data.inherits_class('native', d):
129 return "yes"
130 return "no"
131
125# This will make native perl use target settings (for include dirs etc.) 132# This will make native perl use target settings (for include dirs etc.)
126export PERLCONFIGTARGET = "${@is_target(d)}" 133export PERLCONFIGTARGET = "${@is_target(d)}"
127export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}" 134export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}"
128 135
136EXTRA_AUTORECONF += "-I config"
137
129do_configure() { 138do_configure() {
130 # do_configure 139 # do_configure
131 autotools_do_configure 140 autotools_do_configure
@@ -168,6 +177,11 @@ do_configure() {
168 177
169do_compile:append() { 178do_compile:append() {
170 oe_runmake -C contrib all 179 oe_runmake -C contrib all
180
181 for f in `find ${B} -name "*.[c|h]"`;
182 do
183 sed -i -e 's,${B}/../,,' $f
184 done
171} 185}
172 186
173# server needs to configure user and group 187# server needs to configure user and group
@@ -235,7 +249,7 @@ postgresql_fix_sources () {
235 for f in ${PKGD}${TARGET_DBGSRC_DIR}/src/pl/plperl/Util.c \ 249 for f in ${PKGD}${TARGET_DBGSRC_DIR}/src/pl/plperl/Util.c \
236 ${PKGD}${TARGET_DBGSRC_DIR}/src/pl/plperl/SPI.c; do 250 ${PKGD}${TARGET_DBGSRC_DIR}/src/pl/plperl/SPI.c; do
237 if [ -e $f ]; then 251 if [ -e $f ]; then
238 sed -i -e 's#${B}/../${P}#${TARGET_DBGSRC_DIR}#g' $f 252 sed -i -e 's#${B}/../${BP}#${TARGET_DBGSRC_DIR}#g' $f
239 fi 253 fi
240 done 254 done
241} 255}
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_16.3.bb b/meta-oe/recipes-dbs/postgresql/postgresql_17.5.bb
index 6df719cd98..b7fce886f8 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql_16.3.bb
+++ b/meta-oe/recipes-dbs/postgresql/postgresql_17.5.bb
@@ -1,6 +1,6 @@
1require postgresql.inc 1require postgresql.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=89afbb2d7716371015101c2b2cb4297a" 3LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d5dd73e90ee1a572679460ee67233fcc"
4 4
5SRC_URI += "\ 5SRC_URI += "\
6 file://not-check-libperl.patch \ 6 file://not-check-libperl.patch \
@@ -9,8 +9,9 @@ SRC_URI += "\
9 file://0003-configure.ac-bypass-autoconf-2.69-version-check.patch \ 9 file://0003-configure.ac-bypass-autoconf-2.69-version-check.patch \
10 file://0004-config_info.c-not-expose-build-info.patch \ 10 file://0004-config_info.c-not-expose-build-info.patch \
11 file://0005-postgresql-fix-ptest-failure-of-sysviews.patch \ 11 file://0005-postgresql-fix-ptest-failure-of-sysviews.patch \
12 file://0001-tcl.m4-Recognize-tclsh9.patch \
12" 13"
13 14
14SRC_URI[sha256sum] = "331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585" 15SRC_URI[sha256sum] = "fcb7ab38e23b264d1902cb25e6adafb4525a6ebcbd015434aeef9eda80f528d8"
15 16
16CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Ddoesn't apply to out configuration of postgresql so we can safely ignore it." 17CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Ddoesn't apply to out configuration of postgresql so we can safely ignore it."
diff --git a/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch b/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch
new file mode 100644
index 0000000000..9cc5ad9b86
--- /dev/null
+++ b/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch
@@ -0,0 +1,45 @@
1From 5bfa9f1cd0523a0cad70cacf5ecf8c1aeb06c4d0 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Tue, 22 Apr 2025 17:47:02 +0000
4Subject: [PATCH] configure: make sure to call AC_CHECK_HEADER_STDBOOL
5
6before using ac_cv_sizeof_bool
7
8It was called after this conditional, so PG_USE_STDBOOL wasn't set
9even when it should be as shown in at the end of config.log:
10
11 ac_cv_header_stdbool_h=yes
12 ac_cv_sizeof_bool=1
13 ac_cv_type__Bool=yes
14 #define SIZEOF_BOOL 1
15 #define HAVE__BOOL 1
16 #define HAVE_STDBOOL_H 1
17
18* fixes:
19 https://github.com/postgresql-interfaces/psqlodbc/issues/110
20 https://github.com/postgresql-interfaces/psqlodbc/issues/94
21
22Upstream-Status: Submitted [https://github.com/postgresql-interfaces/psqlodbc/pull/112]
23
24Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
25---
26 configure.ac | 4 +++-
27 1 file changed, 3 insertions(+), 1 deletion(-)
28
29diff --git a/configure.ac b/configure.ac
30index f35c825..ea363ca 100644
31--- a/configure.ac
32+++ b/configure.ac
33@@ -28,9 +28,11 @@ AC_CHECK_SIZEOF([bool], [],
34 #include <stdbool.h>
35 #endif])
36
37+AC_CHECK_HEADER_STDBOOL()
38+
39 dnl We use <stdbool.h> if we have it and it declares type bool as having
40 dnl size 1. Otherwise, c.h will fall back to declaring bool as unsigned char.
41-if test "$ac_cv_header_stdbool_h" = yes -a "$ac_cv_sizeof_bool" = 1; then
42+if test "$ac_cv_header_stdbool_h" = yes && test "$ac_cv_sizeof_bool" = 1; then
43 AC_DEFINE([PG_USE_STDBOOL], 1,
44 [Define to 1 to use <stdbool.h> to define type bool.])
45 fi
diff --git a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb
index a1ef8e75e9..dfd7f6a1e6 100644
--- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb
+++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb
@@ -19,10 +19,11 @@ HOMEPAGE = "https://odbc.postgresql.org/"
19LICENSE = "LGPL-2.0-only" 19LICENSE = "LGPL-2.0-only"
20LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692" 20LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692"
21 21
22SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \ 22SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions.old/src/${BPN}-${PV}.tar.gz \
23 file://psqlodbc-remove-some-checks-for-cross-compiling.patch \ 23 file://psqlodbc-remove-some-checks-for-cross-compiling.patch \
24 file://psqlodbc-donot-use-the-hardcode-libdir.patch \ 24 file://psqlodbc-donot-use-the-hardcode-libdir.patch \
25 file://psqlodbc-fix-for-ptest-support.patch \ 25 file://psqlodbc-fix-for-ptest-support.patch \
26 file://0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch \
26 file://run-ptest \ 27 file://run-ptest \
27" 28"
28 29
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch
new file mode 100644
index 0000000000..b0a949fe31
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch
@@ -0,0 +1,42 @@
1From 9abf6cd09c60f0be9a85c055dfdf43698f057f73 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 25 Sep 2024 13:47:37 +0800
4Subject: [PATCH] CMakeLists.txt: Make the test discovery occur on target
5
6Set DISCOVERY_MODE to PRE_TEST to delay test discovery until just
7prior to test execution on the target to fix the build failure as
8the default POST_BUILD behavior is not desirable in cross-compiling
9env.
10
11/build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/build/env_basic_test: error while loading shared libraries: libgflags.so.2.2: cannot open shared object file: No such file or directory
12CMake Error at /build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/recipe-sysroot-native/usr/share/cmake-3.30/Modules/GoogleTestAddTests.cmake:112 (message):
13 Error running test executable.
14
15 Path: '/build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/build/env_basic_test'
16 Working directory: '/build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/build'
17 Result: 127
18 Output:
19
20Upstream-Status: Inappropriate [oe specific]
21
22Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
23---
24 CMakeLists.txt | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
27diff --git a/CMakeLists.txt b/CMakeLists.txt
28index 403ad1243..f34397798 100644
29--- a/CMakeLists.txt
30+++ b/CMakeLists.txt
31@@ -1502,7 +1502,7 @@ if(WITH_TESTS)
32 )
33 target_link_libraries(${exename}${ARTIFACT_SUFFIX} testutillib${ARTIFACT_SUFFIX} testharness gtest ${THIRDPARTY_LIBS} ${ROCKSDB_LIB})
34 if(NOT "${exename}" MATCHES "db_sanity_test")
35- gtest_discover_tests(${exename} DISCOVERY_TIMEOUT 120)
36+ gtest_discover_tests(${exename} DISCOVERY_TIMEOUT 120 DISCOVERY_MODE PRE_TEST)
37 add_dependencies(rocksdb_check ${exename}${ARTIFACT_SUFFIX})
38 endif()
39 endforeach(sourcefile ${TESTS})
40--
412.34.1
42
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch
new file mode 100644
index 0000000000..168bd76ac7
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch
@@ -0,0 +1,65 @@
1From 90eba5458cb4ac2f83cac8aa550927876e6a9a09 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
3Date: Wed, 5 Mar 2025 15:42:46 +0200
4Subject: [PATCH] Add missing include (#13365)
5
6* see more details: http://errors.yoctoproject.org/Errors/Details/851177/
7In file included from TOPDIR/tmp/work/core2-64-oe-linux/rocksdb/9.10.0/git/db/blob/blob_file_meta.cc:6:
8TOPDIR/tmp/work/core2-64-oe-linux/rocksdb/9.10.0/git/db/blob/blob_file_meta.h:28:7: error: 'uint64_t' has not been declared
9 28 | uint64_t blob_file_number, uint64_t total_blob_count,
10 | ^~~~~~~~
11TOPDIR/tmp/work/core2-64-oe-linux/rocksdb/9.10.0/git/db/blob/blob_file_meta.h:15:1: note: 'uint64_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
12 14 | #include "rocksdb/rocksdb_namespace.h"
13 +++ |+#include <cstdint>
14 15 |
15TOPDIR/tmp/work/core2-64-oe-linux/rocksdb/9.10.0/git/db/blob/blob_file_meta.h:28:34: error: 'uint64_t' has not been declared
16 28 | uint64_t blob_file_number, uint64_t total_blob_count,
17 | ^~~~~~~~
18...
19
20* See also: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
21
22Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/13437]
23Signed-off-by: mark.yang <mark.yang@lge.com>
24---
25 db/blob/blob_file_meta.h | 1 +
26 include/rocksdb/trace_record.h | 1 +
27 include/rocksdb/write_batch_base.h | 1 +
28 3 files changed, 3 insertions(+)
29
30diff --git a/db/blob/blob_file_meta.h b/db/blob/blob_file_meta.h
31index d7c8a1243..2e47726f8 100644
32--- a/db/blob/blob_file_meta.h
33+++ b/db/blob/blob_file_meta.h
34@@ -6,6 +6,7 @@
35 #pragma once
36
37 #include <cassert>
38+#include <cstdint>
39 #include <iosfwd>
40 #include <memory>
41 #include <string>
42diff --git a/include/rocksdb/trace_record.h b/include/rocksdb/trace_record.h
43index 8f9c3ee2f..d321f5387 100644
44--- a/include/rocksdb/trace_record.h
45+++ b/include/rocksdb/trace_record.h
46@@ -5,6 +5,7 @@
47
48 #pragma once
49
50+#include <cstdint>
51 #include <memory>
52 #include <string>
53 #include <vector>
54diff --git a/include/rocksdb/write_batch_base.h b/include/rocksdb/write_batch_base.h
55index 3334a1292..43b186029 100644
56--- a/include/rocksdb/write_batch_base.h
57+++ b/include/rocksdb/write_batch_base.h
58@@ -9,6 +9,7 @@
59 #pragma once
60
61 #include <cstddef>
62+#include <cstdint>
63
64 #include "rocksdb/attribute_groups.h"
65 #include "rocksdb/rocksdb_namespace.h"
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-checkpoint.h-Add-missing-includes-cstdint.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-checkpoint.h-Add-missing-includes-cstdint.patch
new file mode 100644
index 0000000000..a872be5b54
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-checkpoint.h-Add-missing-includes-cstdint.patch
@@ -0,0 +1,41 @@
1From 31012cdfa435d9203da3c3de8127b66bf018692a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 24 Jan 2023 21:40:43 -0800
4Subject: [PATCH] checkpoint.h: Add missing includes <cstdint>
5
6It uses uint64_t and it comes from <cstdint>
7This is needed with GCC 13 and newer [1]
8
9[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13* build error:
14FAILED: CMakeFiles/checkpoint_test.dir/utilities/checkpoint/checkpoint_test.cc.o
15In file included from rocksdb/9.10.0/git/utilities/checkpoint/checkpoint_test.cc:11:
16rocksdb/9.10.0/git/include/rocksdb/utilities/checkpoint.h:49:35: error: 'uint64_t' has not been declared
17 49 | uint64_t log_size_for_flush = 0,
18 | ^~~~~~~~
19rocksdb/9.10.0/git/include/rocksdb/utilities/checkpoint.h:14:1: note: 'uint64_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
20 13 | #include "rocksdb/status.h"
21 +++ |+#include <cstdint>
22 14 |
23
24Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/11137]
25Signed-off-by: mark.yang <mark.yang@lge.com>
26---
27 include/rocksdb/utilities/checkpoint.h | 1 +
28 1 file changed, 1 insertion(+)
29
30Index: git/include/rocksdb/utilities/checkpoint.h
31===================================================================
32--- git.orig/include/rocksdb/utilities/checkpoint.h
33+++ git/include/rocksdb/utilities/checkpoint.h
34@@ -7,6 +7,7 @@
35
36 #pragma once
37
38+#include <cstdint>
39 #include <string>
40 #include <vector>
41
diff --git a/meta-oe/recipes-dbs/rocksdb/files/run-ptest b/meta-oe/recipes-dbs/rocksdb/files/run-ptest
new file mode 100644
index 0000000000..45406fdfa1
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/run-ptest
@@ -0,0 +1,12 @@
1#!/bin/sh
2ptestdir=$(dirname "$(readlink -f "$0")")
3cd "$ptestdir"/tests || exit
4
5for test in *_test; do
6 if ./${test} >/dev/null 2>&1; then
7 echo "PASS: ${test}"
8 else
9 echo "FAIL: ${test}"
10 fi
11done
12
diff --git a/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch b/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch
new file mode 100644
index 0000000000..9a85e8db45
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch
@@ -0,0 +1,71 @@
1From 285d306494bde3e9c24c8cd6fea1eb380a304d03 Mon Sep 17 00:00:00 2001
2From: Bindu-Bhabu <bindudaniel1996@gmail.com>
3Date: Fri, 26 Jul 2024 15:14:45 +0530
4Subject: Add option to CMake for building static libraries
5
6ROCKSDB creates a STATIC library target reference by default.
7Modify the cmake so that the STATIC library is also an option
8just like creating a SHARED library and set default to ON.
9
10Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/12890]
11
12Signed-off-by: Nisha Parrakat <nisha.m.parrakat@bmw.de>
13Signed-off-by: Bindu Bhabu <bhabu.bindu@kpit.com>
14---
15 CMakeLists.txt | 29 +++++++++++++++++------------
16 1 file changed, 17 insertions(+), 12 deletions(-)
17
18diff --git a/CMakeLists.txt b/CMakeLists.txt
19index 93b884dd9c1..2ca925d505c 100644
20--- a/CMakeLists.txt
21+++ b/CMakeLists.txt
22@@ -98,6 +98,7 @@ if (WITH_WINDOWS_UTF8_FILENAMES)
23 add_definitions(-DROCKSDB_WINDOWS_UTF8_FILENAMES)
24 endif()
25 option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON)
26+option(ROCKSDB_BUILD_STATIC "Build static versions of the RocksDB libraries" ON)
27
28 if( NOT DEFINED CMAKE_CXX_STANDARD )
29 set(CMAKE_CXX_STANDARD 17)
30@@ -1139,11 +1140,13 @@ string(REGEX REPLACE "[^0-9: /-]+" "" GIT_DATE "${GIT_DATE}")
31 set(BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/build_version.cc)
32 configure_file(util/build_version.cc.in ${BUILD_VERSION_CC} @ONLY)
33
34-add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC})
35-target_include_directories(${ROCKSDB_STATIC_LIB} PUBLIC
36- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
37-target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE
38- ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
39+if(ROCKSDB_BUILD_STATIC)
40+ add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC})
41+ target_include_directories(${ROCKSDB_STATIC_LIB} PUBLIC
42+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
43+ target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE
44+ ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
45+endif()
46
47 if(ROCKSDB_BUILD_SHARED)
48 add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES} ${BUILD_VERSION_CC})
49@@ -1238,13 +1241,15 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
50
51 install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})
52
53- install(
54- TARGETS ${ROCKSDB_STATIC_LIB}
55- EXPORT RocksDBTargets
56- COMPONENT devel
57- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
58- INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
59- )
60+ if(ROCKSDB_BUILD_STATIC)
61+ install(
62+ TARGETS ${ROCKSDB_STATIC_LIB}
63+ EXPORT RocksDBTargets
64+ COMPONENT devel
65+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
66+ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
67+ )
68+ endif()
69
70 if(ROCKSDB_BUILD_SHARED)
71 install(
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb
index 444351dbb4..5bbb010f8b 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \
6 file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 6 file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
7 file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" 7 file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
8 8
9SRCREV = "f4441966592636253fd5ab0bb9ed44fc2697fc53" 9SRCREV = "ae8fb3e5000e46d8d4c9dbf3a36019c0aaceebff"
10SRCBRANCH = "9.0.fb" 10SRCBRANCH = "9.10.fb"
11 11
12SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \ 12SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \
13 file://0001-cmake-Add-check-for-atomic-support.patch \ 13 file://0001-cmake-Add-check-for-atomic-support.patch \
@@ -17,6 +17,11 @@ SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=htt
17 file://0005-Implement-timer-implementation-for-mips-platform.patch \ 17 file://0005-Implement-timer-implementation-for-mips-platform.patch \
18 file://0006-Implement-timer-for-arm-v6.patch \ 18 file://0006-Implement-timer-for-arm-v6.patch \
19 file://0007-Fix-declaration-scope-of-LE_LOAD32-in-crc32c.patch \ 19 file://0007-Fix-declaration-scope-of-LE_LOAD32-in-crc32c.patch \
20 file://static_library_as_option.patch \
21 file://0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch \
22 file://run-ptest \
23 file://0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch \
24 file://0001-checkpoint.h-Add-missing-includes-cstdint.patch \
20 " 25 "
21 26
22SRC_URI:append:riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" 27SRC_URI:append:riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch"
@@ -24,9 +29,8 @@ SRC_URI:append:mips = " file://0001-replace-old-sync-with-new-atomic-builtin-equ
24SRC_URI:append:powerpc = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" 29SRC_URI:append:powerpc = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch"
25SRC_URI:remove:toolchain-clang:riscv32 = "file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" 30SRC_URI:remove:toolchain-clang:riscv32 = "file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch"
26 31
27S = "${WORKDIR}/git"
28 32
29inherit cmake 33inherit cmake ptest
30 34
31PACKAGECONFIG ??= "bzip2 zlib lz4 gflags" 35PACKAGECONFIG ??= "bzip2 zlib lz4 gflags"
32PACKAGECONFIG[bzip2] = "-DWITH_BZ2=ON,-DWITH_BZ2=OFF,bzip2" 36PACKAGECONFIG[bzip2] = "-DWITH_BZ2=ON,-DWITH_BZ2=OFF,bzip2"
@@ -39,10 +43,11 @@ PACKAGECONFIG[gflags] = "-DWITH_GFLAGS=ON,-DWITH_GFLAGS=OFF,gflags"
39# Tools and tests currently don't compile on armv5 so we disable them 43# Tools and tests currently don't compile on armv5 so we disable them
40EXTRA_OECMAKE = "\ 44EXTRA_OECMAKE = "\
41 -DPORTABLE=ON \ 45 -DPORTABLE=ON \
42 -DWITH_TESTS=OFF \ 46 -DWITH_TESTS=${@bb.utils.contains("DISTRO_FEATURES", "ptest", "ON", "OFF", d)} \
43 -DWITH_BENCHMARK_TOOLS=OFF \ 47 -DWITH_BENCHMARK_TOOLS=OFF \
44 -DWITH_TOOLS=OFF \ 48 -DWITH_TOOLS=OFF \
45 -DFAIL_ON_WARNINGS=OFF \ 49 -DFAIL_ON_WARNINGS=OFF \
50 -DROCKSDB_BUILD_STATIC=OFF \
46" 51"
47 52
48CXXFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}" 53CXXFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}"
@@ -52,6 +57,21 @@ do_install:append() {
52 sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/rocksdb/RocksDBTargets.cmake 57 sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/rocksdb/RocksDBTargets.cmake
53} 58}
54 59
60do_install_ptest() {
61 install -d ${D}${PTEST_PATH}/tests
62 # only cover the basic test as all the tests need to take about 6 hours
63 # time ./run-ptest
64 # real 356m32.956s
65 # user 252m32.004s
66 # sys 178m50.246s
67 install -m 0755 ${B}/env_basic_test ${D}${PTEST_PATH}/tests/
68 install -m 0755 ${B}/db_basic_test ${D}${PTEST_PATH}/tests/
69 install -m 0755 ${B}/agg_merge_test ${D}${PTEST_PATH}/tests/
70 install -m 0755 ${B}/testutil_test ${D}${PTEST_PATH}/tests/
71 install -m 0755 ${B}/cache_test ${D}${PTEST_PATH}/tests/
72}
73
55# Need toku_time_now() implemented for ppc/musl 74# Need toku_time_now() implemented for ppc/musl
56# see utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h 75# see utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
57COMPATIBLE_HOST:libc-musl:powerpc = "null" 76COMPATIBLE_HOST:libc-musl:powerpc = "null"
77COMPATIBLE_HOST:armv5 = 'null'
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 13:07:35 +0000