mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
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>
This commit is contained in:
@@ -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-innobase-Define-__NR_futex-if-it-does-not-exist.patch \
|
||||||
file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \
|
file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \
|
||||||
file://sys_futex.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"
|
SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch"
|
||||||
|
|
||||||
|
|||||||
+35
@@ -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
|
||||||
|
|
||||||
Reference in New Issue
Block a user