summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb-native_10.3.13.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb-native_5.5.62.bb)1
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc34
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch8
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch67
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/change-cc-to-cc-version.patch26
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch32
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch27
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch16
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch29
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/fix-mysqlclient-r-version.patch160
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/remove-bad-path.patch18
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch65
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch34
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb_10.3.13.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb_5.5.62.bb)2
14 files changed, 248 insertions, 271 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.62.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.13.bb
index 4ce960d7d..e1a038dfa 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.62.bb
+++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.13.bb
@@ -13,6 +13,7 @@ do_install() {
13 13
14 install -d ${D}${bindir} 14 install -d ${D}${bindir}
15 install -m 0755 sql/gen_lex_hash ${D}${bindir}/ 15 install -m 0755 sql/gen_lex_hash ${D}${bindir}/
16 install -m 0755 sql/gen_lex_token ${D}${bindir}/
16 install -m 0755 extra/comp_err ${D}${bindir}/ 17 install -m 0755 extra/comp_err ${D}${bindir}/
17 install -m 0755 scripts/comp_sql ${D}${bindir}/ 18 install -m 0755 scripts/comp_sql ${D}${bindir}/
18} 19}
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 8ca5b2ba4..00a9d668c 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -4,10 +4,7 @@ SECTION = "libs"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
6 6
7SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \ 7SRC_URI = "https://downloads.mariadb.org/interstitial/${BPN}-${PV}/source/${BPN}-${PV}.tar.gz \
8 file://fix-cmake-module-path.patch \
9 file://remove-bad-path.patch \
10 file://fix-mysqlclient-r-version.patch \
11 file://my.cnf \ 8 file://my.cnf \
12 file://mysqld.service \ 9 file://mysqld.service \
13 file://install_db.service \ 10 file://install_db.service \
@@ -15,11 +12,14 @@ SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \
15 file://mysql-systemd-start \ 12 file://mysql-systemd-start \
16 file://configure.cmake-fix-valgrind.patch \ 13 file://configure.cmake-fix-valgrind.patch \
17 file://fix-a-building-failure.patch \ 14 file://fix-a-building-failure.patch \
18 file://change-cc-to-cc-version.patch \ 15 file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \
16 file://sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
19 file://0001-disable-ucontext-on-musl.patch \ 17 file://0001-disable-ucontext-on-musl.patch \
18 file://c11_atomics.patch \
19 file://clang_version_header_conflict.patch \
20 " 20 "
21SRC_URI[md5sum] = "6375d577e9539b839f44d857e70f82b9" 21SRC_URI[md5sum] = "603ce42e35b9a688f2cca05275acb5cb"
22SRC_URI[sha256sum] = "56a365af71b8a9ec8bfee0801e2dec95011da8ee7507986ca329be11296411db" 22SRC_URI[sha256sum] = "b2aa857ef5b84f85a7ea60a1eac7b34c0ca5151c71a0d44ce2d7fb028d71459a"
23 23
24UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" 24UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
25 25
@@ -62,7 +62,8 @@ PACKAGECONFIG[setupdb] = ", ,,${PN}-setupdb"
62# MariaDB doesn't link properly with gold 62# MariaDB doesn't link properly with gold
63# https://mariadb.atlassian.net/browse/MDEV-5982 63# https://mariadb.atlassian.net/browse/MDEV-5982
64TARGET_CFLAGS += "-fuse-ld=bfd" 64TARGET_CFLAGS += "-fuse-ld=bfd"
65 65LDFLAGS += " -pthread"
66LDFLAGS_append_armv5 = " -latomic"
66BUILD_CFLAGS += "-fuse-ld=bfd" 67BUILD_CFLAGS += "-fuse-ld=bfd"
67BUILD_CXXFLAGS += "-fuse-ld=bfd" 68BUILD_CXXFLAGS += "-fuse-ld=bfd"
68 69
@@ -120,6 +121,11 @@ do_compile_prepend_class-target () {
120 echo "#endif" >>${B}/include/openssl/kssl.h 121 echo "#endif" >>${B}/include/openssl/kssl.h
121 fi 122 fi
122 fi 123 fi
124 # workaround to handle out-of-source build from source package
125 yacc_files="sql_yacc.hh sql_yacc.cc sql_yacc_ora.hh sql_yacc_ora.cc"
126 for yacc_file in ${yacc_files}; do
127 cp ${S}/sql/${yacc_file} ${B}/sql/${yacc_file}
128 done
123} 129}
124 130
125SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess" 131SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess"
@@ -181,13 +187,13 @@ RDEPENDS_${PN}-client = "perl perl-module-getopt-long perl-module-file-temp \
181RDEPENDS_${PN}-server = "perl perl-module-getopt-long perl-module-data-dumper \ 187RDEPENDS_${PN}-server = "perl perl-module-getopt-long perl-module-data-dumper \
182 perl-module-file-basename perl-module-file-path perl-module-sys-hostname \ 188 perl-module-file-basename perl-module-file-path perl-module-sys-hostname \
183 perl-module-file-copy perl-module-file-temp perl-module-posix \ 189 perl-module-file-copy perl-module-file-temp perl-module-posix \
184 ${PN}-client libdbi-perl libdbd-mysql-perl" 190 ${PN}-client ${PN}-setupdb libdbi-perl libdbd-mysql-perl"
185RDEPENDS_${PN}-leftovers = "perl perl-module-cwd perl-module-benchmark perl-module-getopt-long \ 191RDEPENDS_${PN}-leftovers = "perl perl-module-cwd perl-module-benchmark perl-module-getopt-long \
186 perl-module-posix perl-module-data-dumper perl-module-sigtrap perl-module-threads \ 192 perl-module-posix perl-module-data-dumper perl-module-sigtrap perl-module-threads \
187 perl-module-threads-shared perl-module-io-socket perl-module-sys-hostname perl-module-file-copy \ 193 perl-module-threads-shared perl-module-io-socket perl-module-sys-hostname perl-module-file-copy \
188 perl-module-file-spec perl-module-file-find perl-module-file-basename perl-module-file-path \ 194 perl-module-file-spec perl-module-file-find perl-module-file-basename perl-module-file-path \
189 perl-module-constant perl-module-lib perl-module-file-temp perl-module-file-spec-functions \ 195 perl-module-constant perl-module-lib perl-module-file-temp perl-module-file-spec-functions \
190 perl-module-io-socket-inet perl-module-io-select" 196 perl-module-io-socket-inet perl-module-io-select bash"
191RDEPENDS_${PN}-setupdb = "coreutils" 197RDEPENDS_${PN}-setupdb = "coreutils"
192 198
193# Allow old code to link to the backward compatible library 199# Allow old code to link to the backward compatible library
@@ -195,10 +201,12 @@ RDEPENDS_libmysqlclient-dev = "libmysqlclient-r-dev"
195 201
196FILES_libmysqlclient = "\ 202FILES_libmysqlclient = "\
197 ${libdir}/libmysqlclient.so.* \ 203 ${libdir}/libmysqlclient.so.* \
204 ${libdir}/libmariadb.so.* \
198 ${sysconfdir}/my.cnf.d/client.cnf" 205 ${sysconfdir}/my.cnf.d/client.cnf"
199FILES_libmysqlclient-dev = " \ 206FILES_libmysqlclient-dev = " \
200 ${includedir}/mysql/ \ 207 ${includedir}/mysql/ \
201 ${libdir}/libmysqlclient.so \ 208 ${libdir}/libmysqlclient.so \
209 ${libdir}/libmariadb.so \
202 ${sysconfdir}/aclocal \ 210 ${sysconfdir}/aclocal \
203 ${bindir}/mysql_config" 211 ${bindir}/mysql_config"
204FILES_libmysqlclient-staticdev = "\ 212FILES_libmysqlclient-staticdev = "\
@@ -215,9 +223,11 @@ FILES_libmysqlclient-r-dev = "\
215FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" 223FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a"
216 224
217FILES_libmysqld = "\ 225FILES_libmysqld = "\
218 ${libdir}/libmysqld.so.*" 226 ${libdir}/libmysqld.so.* \
227 ${libdir}/libmariadbd.so.*"
219FILES_libmysqld-dev = "\ 228FILES_libmysqld-dev = "\
220 ${libdir}/libmysqld.so" 229 ${libdir}/libmysqld.so \
230 ${libdir}/libmariadbd.so"
221 231
222FILES_${PN}-client = "\ 232FILES_${PN}-client = "\
223 ${bindir}/myisam_ftdump \ 233 ${bindir}/myisam_ftdump \
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch
index 60e9199f9..daf2432a5 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch
@@ -1,4 +1,4 @@
1From 5bc3e7ef9700d12054e0125a126f1bb093f01ef9 Mon Sep 17 00:00:00 2001 1From b658bdb38b7ff6a78915fd0ac390fc224e4006cb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 26 Mar 2017 14:30:33 -0700 3Date: Sun, 26 Mar 2017 14:30:33 -0700
4Subject: [PATCH] disable ucontext on musl 4Subject: [PATCH] disable ucontext on musl
@@ -6,12 +6,13 @@ Subject: [PATCH] disable ucontext on musl
6musl does not have *contex() APIs even though it has ucontext.h header 6musl does not have *contex() APIs even though it has ucontext.h header
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
9--- 10---
10 include/my_context.h | 2 +- 11 include/my_context.h | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
12 13
13diff --git a/include/my_context.h b/include/my_context.h 14diff --git a/include/my_context.h b/include/my_context.h
14index dd44103..9b28c17 100644 15index ea0e3496..4c9b37dc 100644
15--- a/include/my_context.h 16--- a/include/my_context.h
16+++ b/include/my_context.h 17+++ b/include/my_context.h
17@@ -31,7 +31,7 @@ 18@@ -31,7 +31,7 @@
@@ -23,6 +24,3 @@ index dd44103..9b28c17 100644
23 #define MY_CONTEXT_USE_UCONTEXT 24 #define MY_CONTEXT_USE_UCONTEXT
24 #else 25 #else
25 #define MY_CONTEXT_DISABLE 26 #define MY_CONTEXT_DISABLE
26--
272.12.1
28
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch b/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch
new file mode 100644
index 000000000..169986130
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch
@@ -0,0 +1,67 @@
1Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
2Date: Fri Dec 21 19:14:04 2018 +0200
3
4 Link with libatomic to enable C11 atomics support
5
6 Some architectures (mips) require libatomic to support proper
7 atomic operations. Check first if support is available without
8 linking, otherwise use the library.
9
10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13--- a/configure.cmake
14+++ b/configure.cmake
15@@ -926,7 +926,25 @@ int main()
16 long long int *ptr= &var;
17 return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
18 }"
19-HAVE_GCC_C11_ATOMICS)
20+HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
21+IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
22+ SET(HAVE_GCC_C11_ATOMICS True)
23+ELSE()
24+ SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
25+ LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
26+ CHECK_CXX_SOURCE_COMPILES("
27+ int main()
28+ {
29+ long long int var= 1;
30+ long long int *ptr= &var;
31+ return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
32+ }"
33+ HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
34+ IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
35+ SET(HAVE_GCC_C11_ATOMICS True)
36+ ENDIF()
37+ SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
38+ENDIF()
39
40 IF(WITH_VALGRIND)
41 SET(HAVE_valgrind 1)
42--- a/mysys/CMakeLists.txt
43+++ b/mysys/CMakeLists.txt
44@@ -78,6 +78,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
45 ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY})
46 DTRACE_INSTRUMENT(mysys)
47
48+IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
49+ TARGET_LINK_LIBRARIES(mysys atomic)
50+ENDIF()
51+
52 IF(HAVE_BFD_H)
53 TARGET_LINK_LIBRARIES(mysys bfd)
54 ENDIF(HAVE_BFD_H)
55--- a/sql/CMakeLists.txt
56+++ b/sql/CMakeLists.txt
57@@ -178,6 +178,10 @@ ELSE()
58 SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL})
59 ENDIF()
60
61+IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
62+ TARGET_LINK_LIBRARIES(sql atomic)
63+ENDIF()
64+
65
66 IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS)
67
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/change-cc-to-cc-version.patch b/meta-oe/recipes-dbs/mysql/mariadb/change-cc-to-cc-version.patch
deleted file mode 100644
index 02bda24f7..000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/change-cc-to-cc-version.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1mariadb: replace the CC with CC_VERSION and CXX with CXX_VERSION
2
3mysqlbug.sh is a bug report script. It makes a report with the build information,
4including gcc version. The CC is the local path of gcc, which is useless for bug
5report, and the path may expose private information, so change it to CC_VERSION.
6
7Upstream-Status: Pending
8
9Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
10Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
11================================
12diff --git a/scripts/mysqlbug.sh.old b/scripts/mysqlbug.sh
13index e9df210..d4b8d53 100644
14--- a/scripts/mysqlbug.sh.old
15+++ b/scripts/mysqlbug.sh
16@@ -24,8 +24,8 @@ VERSION="@VERSION@@MYSQL_SERVER_SUFFIX@"
17 COMPILATION_COMMENT="@COMPILATION_COMMENT@"
18 BUGmysql="maria-developers@lists.launchpad.net"
19 # This is set by configure
20-COMP_CALL_INFO="CC='@SAVE_CC@' CFLAGS='@SAVE_CFLAGS@' CXX='@SAVE_CXX@' CXXFLAGS='@SAVE_CXXFLAGS@' LDFLAGS='@SAVE_LDFLAGS@' ASFLAGS='@SAVE_ASFLAGS@'"
21-COMP_RUN_INFO="CC='@CC@' CFLAGS='@CFLAGS@' CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' LDFLAGS='@LDFLAGS@' ASFLAGS='@ASFLAGS@'"
22+COMP_CALL_INFO="CC='@CC_VERSION@' CFLAGS='@SAVE_CFLAGS@' CXX='@CXX_VERSION@' CXXFLAGS='@SAVE_CXXFLAGS@' LDFLAGS='@SAVE_LDFLAGS@' ASFLAGS='@SAVE_ASFLAGS@'"
23+COMP_RUN_INFO="CC='@CC_VERSION@' CFLAGS='@CFLAGS@' CXX='@CXX_VERSION@' CXXFLAGS='@CXXFLAGS@' LDFLAGS='@LDFLAGS@' ASFLAGS='@ASFLAGS@'"
24 CONFIGURE_LINE="@CONF_COMMAND@"
25
26 LIBC_INFO=""
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch b/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch
new file mode 100644
index 000000000..c77a86944
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch
@@ -0,0 +1,32 @@
1libc++ also has a file called version and this file and how cflags are specified
2it ends up including this file and resulting in compile errors
3
4fixes errors like
5storage/mroonga/version:1:1: error: expected unqualified-id
67.07
7^
8
9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12--- a/storage/mroonga/CMakeLists.txt
13+++ b/storage/mroonga/CMakeLists.txt
14@@ -80,7 +80,7 @@ else()
15 set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR})
16 endif()
17
18-file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION)
19+file(READ ${MRN_SOURCE_DIR}/ver MRN_VERSION)
20 file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR)
21 file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR)
22 file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO)
23--- /dev/null
24+++ b/storage/mroonga/ver
25@@ -0,0 +1 @@
26+7.07
27\ No newline at end of file
28--- a/storage/mroonga/version
29+++ /dev/null
30@@ -1 +0,0 @@
31-7.07
32\ No newline at end of file
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 e97def602..ac9427958 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,6 +1,6 @@
1From 5effba0d7d47071a3f1bca56823190d5a95bb1a6 Mon Sep 17 00:00:00 2001 1From 24e2b0edc2612acefcc48414bb6f0aeb086061a9 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com> 2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Wed, 12 Nov 2014 03:09:10 -0500 3Date: Tue, 26 Feb 2019 23:57:06 -0800
4Subject: [PATCH] configure.cmake: fix valgrind 4Subject: [PATCH] configure.cmake: fix valgrind
5 5
6Check valgrind headers only if WITH_VALGRIND is set. 6Check valgrind headers only if WITH_VALGRIND is set.
@@ -15,27 +15,26 @@ PACKAGECONFIG to decide if valgrind is needed or not.
15Upstream-Status: Inappropriate [oe specific] 15Upstream-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>
19
18--- 20---
19 configure.cmake | 4 ++-- 21 configure.cmake | 5 ++---
20 1 file changed, 2 insertions(+), 2 deletions(-) 22 1 file changed, 2 insertions(+), 3 deletions(-)
21 23
22diff --git a/configure.cmake b/configure.cmake 24diff --git a/configure.cmake b/configure.cmake
23index 0bd7bbe..51a098f 100644 25index 3cfc4b31..d017b3b3 100644
24--- a/configure.cmake 26--- a/configure.cmake
25+++ b/configure.cmake 27+++ b/configure.cmake
26@@ -1047,10 +1047,10 @@ MARK_AS_ADVANCED(WITH_ATOMIC_LOCKS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY) 28@@ -930,10 +930,9 @@ HAVE_GCC_C11_ATOMICS)
27 29
28 IF(WITH_VALGRIND) 30 IF(WITH_VALGRIND)
29 SET(HAVE_valgrind 1) 31 SET(HAVE_valgrind 1)
30+ CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" 32-ENDIF()
31+ HAVE_VALGRIND) 33-
32 ENDIF()
33
34-CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" 34-CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h"
35- HAVE_VALGRIND) 35+ CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h"
36 HAVE_VALGRIND_MEMCHECK_H)
37+ENDIF()
36 38
37 #-------------------------------------------------------------------- 39 #--------------------------------------------------------------------
38 # Check for IPv6 support 40 # Check for IPv6 support
39--
402.0.0
41
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch
index 0c4e10237..9149ee21f 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch
@@ -1,4 +1,7 @@
1[PATCH] fix a building failure 1From 1b2b6a61c9f82157cd2e0c3744f6c07e07aeb0bd Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Mon, 4 Mar 2019 01:11:30 -0800
4Subject: [PATCH] fix a building failure
2 5
3Upstream-Status: Inappropriate [configuration] 6Upstream-Status: Inappropriate [configuration]
4 7
@@ -6,17 +9,18 @@ building failed since native does not generate import_executables.cmake
6In fact, our building system will export the needed commands 9In fact, our building system will export the needed commands
7 10
8Signed-off-by: Roy Li <rongqing.li@windriver.com> 11Signed-off-by: Roy Li <rongqing.li@windriver.com>
12Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
9--- 13---
10 CMakeLists.txt | 5 ----- 14 CMakeLists.txt | 5 -----
11 1 file changed, 5 deletions(-) 15 1 file changed, 5 deletions(-)
12 16
13diff --git a/CMakeLists.txt b/CMakeLists.txt 17diff --git a/CMakeLists.txt b/CMakeLists.txt
14index c1ce1c5..83b3a7e 100644 18index fc30750..4f9110e 100644
15--- a/CMakeLists.txt 19--- a/CMakeLists.txt
16+++ b/CMakeLists.txt 20+++ b/CMakeLists.txt
17@@ -350,11 +350,6 @@ MYSQL_CHECK_READLINE() 21@@ -347,11 +347,6 @@ CHECK_PCRE()
18 22
19 CHECK_JEMALLOC() 23 CHECK_SYSTEMD()
20 24
21-IF(CMAKE_CROSSCOMPILING) 25-IF(CMAKE_CROSSCOMPILING)
22- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") 26- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
@@ -24,8 +28,8 @@ index c1ce1c5..83b3a7e 100644
24-ENDIF() 28-ENDIF()
25- 29-
26 # 30 #
27 # Setup maintainer mode options by the end. Platform checks are 31 # Setup maintainer mode options. Platform checks are
28 # not run with the warning options as to not perturb fragile checks 32 # not run with the warning options as to not perturb fragile checks
29-- 33--
301.9.1 342.17.1
31 35
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch
deleted file mode 100644
index 8d9f558d0..000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Avoid CMAKE_MODULE_PATH being overwritten
2
3OE-Core's setting of CMAKE_MODULE_PATH stomps on MariaDB's value unless
4we set it after setting the project name.
5
6Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
7
8Upstream-Status: Inappropriate [working around OE-Core bug]
9
10--- mariadb/CMakeLists.txt 2014-07-17 11:01:07.676353047 +0100
11+++ mariadb/CMakeLists.txt 2014-07-17 11:01:31.299353107 +0100
12@@ -28,8 +28,6 @@
13
14 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
15
16-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
17-
18 # Distinguish between community and non-community builds, with the
19 # default being a community build. This does not impact the feature
20 # set that will be compiled in; it's merely provided as a hint to
21@@ -77,6 +75,8 @@
22 ENDIF()
23 PROJECT(${MYSQL_PROJECT_NAME})
24
25+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
26+
27 IF(BUILD_CONFIG)
28 INCLUDE(
29 ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/fix-mysqlclient-r-version.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-mysqlclient-r-version.patch
deleted file mode 100644
index a519e4292..000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/fix-mysqlclient-r-version.patch
+++ /dev/null
@@ -1,160 +0,0 @@
1From 6db2a606196fb38a6d106dc409eee1cb9a40a440 Mon Sep 17 00:00:00 2001
2From: Tor Didriksen <tor.didriksen@oracle.com>
3Date: Mon, 24 Jun 2013 17:15:35 +0200
4Subject: [PATCH] Bug#16809055 MYSQL 5.6 AND 5.7 STILL USE LIBMYSQLCLIENT.SO.18
5
6With this patch, the libmysql/ directory contains:
7libmysqlclient.a
8libmysqlclient_r.a -> libmysqlclient.a
9libmysqlclient_r.so -> libmysqlclient.so*
10libmysqlclient_r.so.18 -> libmysqlclient.so.18*
11libmysqlclient_r.so.18.1.0 -> libmysqlclient.so.18.1.0*
12libmysqlclient.so -> libmysqlclient.so.18*
13libmysqlclient.so.18 -> libmysqlclient.so.18.1.0*
14libmysqlclient.so.18.1.0*
15
16This fixes libmysqlclient_r symlinks pointing to the unversioned
17libmysqlclient.so symlink (leading to package QA errors since the
18libmysqlclient-r package ends up depending on libmysqlclient-dev).
19
20Borrowed from MySQL 5.6 tree at https://github.com/percona/mysql/
21
22Upstream-Status: Pending
23
24Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
25
26---
27 cmake/install_macros.cmake | 25 +++++++++++++++----------
28 libmysql/CMakeLists.txt | 34 +++++++++++++++++++++++++++-------
29 2 files changed, 42 insertions(+), 17 deletions(-)
30
31diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
32index b8efdf8..a0d0e68 100644
33--- a/cmake/install_macros.cmake
34+++ b/cmake/install_macros.cmake
35@@ -1,4 +1,4 @@
36-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
37+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
38 #
39 # This program is free software; you can redistribute it and/or modify
40 # it under the terms of the GNU General Public License as published by
41@@ -167,28 +167,33 @@ ENDFUNCTION()
42
43
44 # Install symbolic link to CMake target.
45-# the link is created in the same directory as target
46-# and extension will be the same as for target file.
47-MACRO(INSTALL_SYMLINK linkname target destination component)
48+# We do 'cd path; ln -s target_name link_name'
49+# We also add an INSTALL target for "${path}/${link_name}"
50+MACRO(INSTALL_SYMLINK target target_name link_name destination component)
51 IF(UNIX)
52 GET_TARGET_PROPERTY(location ${target} LOCATION)
53 GET_FILENAME_COMPONENT(path ${location} PATH)
54- GET_FILENAME_COMPONENT(name ${location} NAME)
55- SET(output ${path}/${linkname})
56+ MESSAGE(STATUS "target ${target}")
57+ MESSAGE(STATUS "link_name ${link_name}")
58+ MESSAGE(STATUS "target_name ${target_name}")
59+ MESSAGE(STATUS "path ${path}")
60+ MESSAGE(STATUS "")
61+
62+ SET(output ${path}/${link_name})
63 ADD_CUSTOM_COMMAND(
64 OUTPUT ${output}
65 COMMAND ${CMAKE_COMMAND} ARGS -E remove -f ${output}
66 COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink
67- ${name}
68- ${linkname}
69+ ${target_name}
70+ ${link_name}
71 WORKING_DIRECTORY ${path}
72 DEPENDS ${target}
73 )
74
75- ADD_CUSTOM_TARGET(symlink_${linkname}
76+ ADD_CUSTOM_TARGET(symlink_${link_name}
77 ALL
78 DEPENDS ${output})
79- SET_TARGET_PROPERTIES(symlink_${linkname} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
80+ SET_TARGET_PROPERTIES(symlink_${link_name} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
81 IF(CMAKE_GENERATOR MATCHES "Xcode")
82 # For Xcode, replace project config with install config
83 STRING(REPLACE "${CMAKE_CFG_INTDIR}"
84diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
85index be5760f..96286ff 100644
86--- a/libmysql/CMakeLists.txt
87+++ b/libmysql/CMakeLists.txt
88@@ -433,6 +433,12 @@ IF(MSVC)
89 INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
90 ENDIF()
91
92+MACRO(GET_TARGET_NAME target out_name)
93+ GET_TARGET_PROPERTY(location ${target} LOCATION)
94+ GET_FILENAME_COMPONENT(name ${location} NAME)
95+ SET(${out_name} ${name})
96+ENDMACRO()
97+
98 IF(UNIX)
99 MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
100 SET(DOT_VERSION ".${VERSION}")
101@@ -445,7 +451,13 @@ IF(UNIX)
102 SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION})
103 ENDIF()
104 ENDMACRO()
105- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
106+ENDIF()
107+
108+IF(UNIX)
109+ GET_TARGET_NAME(mysqlclient lib_name)
110+ INSTALL_SYMLINK(mysqlclient
111+ ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
112+ ${INSTALL_LIBDIR} Development)
113 ENDIF()
114
115 IF(NOT DISABLE_SHARED)
116@@ -456,10 +468,9 @@ IF(NOT DISABLE_SHARED)
117 # libtool compatability
118 IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
119 SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
120- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
121- SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
122 ELSE()
123- SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0")
124+ SET(OS_SHARED_LIB_VERSION
125+ "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0")
126 ENDIF()
127 # Name of shared library is mysqlclient on Unix
128 SET_TARGET_PROPERTIES(libmysql PROPERTIES
129@@ -482,8 +493,13 @@ IF(NOT DISABLE_SHARED)
130 "${CMAKE_SHARED_LIBRARY_SUFFIX}"
131 ""
132 linkname)
133- INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
134- SET(OS_SHARED_LIB_SYMLINKS "${SHARED_LIB_MAJOR_VERSION}" "${OS_SHARED_LIB_VERSION}")
135+ GET_TARGET_NAME(libmysql lib_name)
136+ GET_FILENAME_COMPONENT(lib_name_we ${lib_name} NAME_WE)
137+ INSTALL_SYMLINK(libmysql
138+ ${lib_name} ${linkname}
139+ ${INSTALL_LIBDIR} SharedLibraries)
140+ SET(OS_SHARED_LIB_SYMLINKS
141+ "${SHARED_LIB_MAJOR_VERSION}" "${OS_SHARED_LIB_VERSION}")
142 LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS)
143 FOREACH(ver ${OS_SHARED_LIB_SYMLINKS})
144 GET_VERSIONED_LIBNAME(
145@@ -491,7 +507,11 @@ IF(NOT DISABLE_SHARED)
146 "${CMAKE_SHARED_LIBRARY_SUFFIX}"
147 "${ver}"
148 linkname)
149- INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
150+ GET_VERSIONED_LIBNAME(
151+ ${lib_name_we} "${CMAKE_SHARED_LIBRARY_SUFFIX}" "${ver}" lib_name_ver)
152+ INSTALL_SYMLINK(libmysql
153+ ${lib_name_ver} ${linkname}
154+ ${INSTALL_LIBDIR} SharedLibraries)
155 ENDFOREACH()
156 ENDIF()
157 ENDIF()
158--
1592.0.3
160
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/remove-bad-path.patch b/meta-oe/recipes-dbs/mysql/mariadb/remove-bad-path.patch
deleted file mode 100644
index ff26b0b86..000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/remove-bad-path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Remove host path from include directories
2
3Naturally this breaks cross-compilation if present.
4
5Upstream-Status: Pending
6
7Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
8
9--- mariadb-5.5.38/storage/tokudb/ft-index/CMakeLists.txt 2014-07-17 14:37:04.529327998 +0100
10+++ mariadb-5.5.38/storage/tokudb/ft-index/CMakeLists.txt 2014-07-17 14:43:56.991337895 +0100
11@@ -39,7 +39,6 @@
12
13 ## default includes and libraries
14 include_directories(SYSTEM
15- /usr/local/include
16 ${ZLIB_INCLUDE_DIRS}
17 )
18
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch b/meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch
new file mode 100644
index 000000000..afc1be47b
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch
@@ -0,0 +1,65 @@
1From 796464015bffe6e0beca9e1c355b223512803c3e Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 27 Feb 2019 23:01:00 -0800
4Subject: [PATCH] sql/CMakeLists.txt: fix gen_lex_hash not found
5
6Fix the below do_compile issue in cross-compiling env.
7| make[2]: *** No rule to make target '/build/tmp/work/aarch64-poky-linux/mariadb/10.3.13-r0/mariadb-10.3.13/sql/gen_lex_hash', needed by 'sql/lex_hash.h'. Stop.
8| make[2]: *** No rule to make target '/build/tmp/work/aarch64-poky-linux/mariadb/10.3.13-r0/mariadb-10.3.13/sql/gen_lex_token', needed by 'sql/lex_token.h'. Stop.
9
10Upstream-Status: Inappropriate [oe build specific]
11
12Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
13
14---
15 sql/CMakeLists.txt | 30 ++++++++++++++++++++----------
16 1 file changed, 20 insertions(+), 10 deletions(-)
17
18diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
19index c6910f46..bf51f4cb 100644
20--- a/sql/CMakeLists.txt
21+++ b/sql/CMakeLists.txt
22@@ -50,11 +50,16 @@ ${WSREP_INCLUDES}
23
24
25
26-ADD_CUSTOM_COMMAND(
27- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h
28- COMMAND gen_lex_token > lex_token.h
29- DEPENDS gen_lex_token
30-)
31+IF(NOT CMAKE_CROSSCOMPILING)
32+ ADD_CUSTOM_COMMAND(
33+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h
34+ COMMAND gen_lex_token > lex_token.h
35+ DEPENDS gen_lex_token)
36+ELSE()
37+ ADD_CUSTOM_COMMAND(
38+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h
39+ COMMAND gen_lex_token > lex_token.h)
40+ENDIF()
41
42 ADD_DEFINITIONS(-DMYSQL_SERVER -DHAVE_EVENT_SCHEDULER)
43
44@@ -370,11 +375,16 @@ IF(NOT CMAKE_CROSSCOMPILING)
45 ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
46 ENDIF()
47
48-ADD_CUSTOM_COMMAND(
49- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
50- COMMAND gen_lex_hash > lex_hash.h
51- DEPENDS gen_lex_hash
52-)
53+IF(NOT CMAKE_CROSSCOMPILING)
54+ ADD_CUSTOM_COMMAND(
55+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
56+ COMMAND gen_lex_hash > lex_hash.h
57+ DEPENDS gen_lex_hash)
58+ELSE()
59+ ADD_CUSTOM_COMMAND(
60+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
61+ COMMAND gen_lex_hash > lex_hash.h)
62+ENDIF()
63
64 MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc COMPONENT Server)
65 SET_TARGET_PROPERTIES(mysql_tzinfo_to_sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL")
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
new file mode 100644
index 000000000..4f9a4e9b0
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch
@@ -0,0 +1,34 @@
1From 4ac5b555d058d4d489f25a3806a787b7b2465d09 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 27 Feb 2019 22:41:26 -0800
4Subject: [PATCH] support-files/CMakeLists.txt: fix do_populate_sysroot issue
5
6Comment out the logic which for suse as it introduces
7below do_populate_sysroot error:
8ERROR: mariadb-native-10.3.13-r0 do_populate_sysroot: sstate found an absolute path symlink /build/tmp/work/x86_64-linux/mariadb-native/10.3.13-r0/sysroot-destdir/build/tmp/work/x86_64-linux/mariadb-native/10.3.13-r0/recipe-sysroot-native/usr/sbin/rcmysql pointing at /build/tmp/work/x86_64-linux/mariadb-native/10.3.13-r0/recipe-sysroot-native/etc/init.d/mysql. Please replace this with a relative link.
9
10Upstream-Status: Inappropriate[oe build specific]
11
12Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
13
14---
15 support-files/CMakeLists.txt | 7 -------
16 1 file changed, 7 deletions(-)
17
18diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
19index b5767432..56733de1 100644
20--- a/support-files/CMakeLists.txt
21+++ b/support-files/CMakeLists.txt
22@@ -165,12 +165,5 @@ IF(UNIX)
23 INSTALL(FILES rpm/enable_encryption.preset DESTINATION ${INSTALL_SYSCONF2DIR}
24 COMPONENT IniFiles)
25 ENDIF()
26-
27- # This is for SuSE:
28- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
29- ${INSTALL_SYSCONFDIR}/init.d/mysql
30- ${INSTALL_SBINDIR}/rcmysql
31- WORKING_DIRECTORY \$ENV{DESTDIR}${prefix})"
32- COMPONENT SupportFiles)
33 ENDIF(INSTALL_SYSCONFDIR)
34 ENDIF()
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_5.5.62.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.3.13.bb
index d7895732a..de24c920f 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb_5.5.62.bb
+++ b/meta-oe/recipes-dbs/mysql/mariadb_10.3.13.bb
@@ -2,7 +2,7 @@ require mariadb.inc
2 2
3EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" 3EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1"
4 4
5DEPENDS += "mariadb-native ncurses zlib readline libaio libevent" 5DEPENDS += "mariadb-native bison-native openssl ncurses zlib readline libaio libevent libxml2"
6 6
7PROVIDES += "mysql5 libmysqlclient" 7PROVIDES += "mysql5 libmysqlclient"
8 8
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 18:54:00 +0000