aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2021-05-10 13:44:04 +0200
committerArmin Kuster <akuster808@gmail.com>2021-07-18 07:53:42 -0700
commit7628af5739ee981c33dc04b6d5b02c07d73aeb94 (patch)
tree9d7a1ca9f528821c7c9982c7447ca46c020b14d0
parentffb3fbb6fec1ba31192b1b54a25fbf75e904f6b4 (diff)
downloadmeta-openembedded-7628af5739ee981c33dc04b6d5b02c07d73aeb94.tar.gz
meta-openembedded-7628af5739ee981c33dc04b6d5b02c07d73aeb94.tar.bz2
meta-openembedded-7628af5739ee981c33dc04b6d5b02c07d73aeb94.zip
mariadb: Fix configure
Assume recent CMake upgrade made this pop up. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit ca18e276d63e9fc6fece6a32e88959cbcf84c91b) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc1
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0002-Fix-configure-by-closing-IF-ELSE-properly.patch35
2 files changed, 36 insertions, 0 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 9833b2885..92e54d759 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -22,6 +22,7 @@ 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 \
"
SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch"
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
new file mode 100644
index 000000000..36c74d8f9
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0002-Fix-configure-by-closing-IF-ELSE-properly.patch
@@ -0,0 +1,35 @@
+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
+