diff options
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb.inc | 5 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/0002-Fix-configure-by-closing-IF-ELSE-properly.patch | 35 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch (renamed from meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch) | 22 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb) | 2 |
6 files changed, 10 insertions, 56 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb index 73b2a0980d..73b2a0980d 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 92e54d7592..2974341bfe 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -11,7 +11,6 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://install_db \ file://mysql-systemd-start \ file://configure.cmake-fix-valgrind.patch \ - file://fix-a-building-failure.patch \ file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \ file://sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ file://0001-disable-ucontext-on-musl.patch \ @@ -22,11 +21,11 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \ file://sys_futex.patch \ - file://0002-Fix-configure-by-closing-IF-ELSE-properly.patch \ + file://cross-compiling.patch \ " SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf" +SRC_URI[sha256sum] = "a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0002-Fix-configure-by-closing-IF-ELSE-properly.patch b/meta-oe/recipes-dbs/mysql/mariadb/0002-Fix-configure-by-closing-IF-ELSE-properly.patch deleted file mode 100644 index 36c74d8f94..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/0002-Fix-configure-by-closing-IF-ELSE-properly.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fdd08a8774265618668c7f24697e138587c47a16 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Mon, 10 May 2021 13:35:54 +0200 -Subject: [PATCH] Fix configure by closing IF ELSE properly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: -| CMake Error at libmariadb/cmake/ConnectorName.cmake:30 (ENDMACRO): -| Flow control statements are not properly nested. - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - libmariadb/cmake/ConnectorName.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libmariadb/cmake/ConnectorName.cmake b/libmariadb/cmake/ConnectorName.cmake -index b7bbbad..357b8ac 100644 ---- a/libmariadb/cmake/ConnectorName.cmake -+++ b/libmariadb/cmake/ConnectorName.cmake -@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") - SET(MACHINE_NAME "x64") - ELSE() - SET(MACHINE_NAME "32") -- END() -+ ENDIF() - ENDIF() - - SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}") --- -2.30.2 - diff --git a/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch b/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch index 9149ee21f2..0f4815b185 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch @@ -1,28 +1,21 @@ -From 1b2b6a61c9f82157cd2e0c3744f6c07e07aeb0bd Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Mon, 4 Mar 2019 01:11:30 -0800 -Subject: [PATCH] fix a building failure - -Upstream-Status: Inappropriate [configuration] +This is not needed for OE builds building failed since native does not generate import_executables.cmake In fact, our building system will export the needed commands +Upstream-Status: Inappropriate [configuration] + Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - CMakeLists.txt | 5 ----- - 1 file changed, 5 deletions(-) +Signed-off-by: Khem Raj <raj.khem@gmail.com> -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc30750..4f9110e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -347,11 +347,6 @@ CHECK_PCRE() +@@ -392,11 +392,6 @@ CHECK_PCRE() CHECK_SYSTEMD() --IF(CMAKE_CROSSCOMPILING) +-IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR) - SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") - INCLUDE(${IMPORT_EXECUTABLES}) -ENDIF() @@ -30,6 +23,3 @@ index fc30750..4f9110e 100644 # # Setup maintainer mode options. Platform checks are # not run with the warning options as to not perturb fragile checks --- -2.17.1 - 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 index 1ca86bcca2..d082d424b0 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch @@ -36,7 +36,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + __builtin_ppc_get_timebase(); #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) /* Mainly, prevent the compiler from optimizing away delay loops */ - __asm__ __volatile__ ("":::"memory"); + __asm__ __volatile__ ("isb":::"memory"); --- a/storage/tokudb/PerconaFT/portability/toku_time.h +++ b/storage/tokudb/PerconaFT/portability/toku_time.h @@ -124,7 +124,7 @@ static inline tokutime_t toku_time_now(v diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb index e6743fe97a..8ae8241b05 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb @@ -2,7 +2,7 @@ require mariadb.inc EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" -DEPENDS += "mariadb-native bison-native libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" +DEPENDS += "mariadb-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" PROVIDES += "mysql5 libmysqlclient" |