From 7628af5739ee981c33dc04b6d5b02c07d73aeb94 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 10 May 2021 13:44:04 +0200 Subject: mariadb: Fix configure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Assume recent CMake upgrade made this pop up. Signed-off-by: Andreas Müller Signed-off-by: Khem Raj (cherry picked from commit ca18e276d63e9fc6fece6a32e88959cbcf84c91b) Signed-off-by: Armin Kuster --- ...Fix-configure-by-closing-IF-ELSE-properly.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0002-Fix-configure-by-closing-IF-ELSE-properly.patch (limited to 'meta-oe/recipes-dbs/mysql/mariadb/0002-Fix-configure-by-closing-IF-ELSE-properly.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 0000000000..36c74d8f94 --- /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?= +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 +--- + 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 + -- cgit 1.2.3-korg