From 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf Mon Sep 17 00:00:00 2001 From: takeshi_hoshina Date: Mon, 2 Nov 2020 11:07:33 +0900 Subject: basesystem-jj recipes --- .../mariadb/clang_version_header_conflict.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 external/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch (limited to 'external/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch') diff --git a/external/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch b/external/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch new file mode 100644 index 00000000..c77a8694 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch @@ -0,0 +1,32 @@ +libc++ also has a file called version and this file and how cflags are specified +it ends up including this file and resulting in compile errors + +fixes errors like +storage/mroonga/version:1:1: error: expected unqualified-id +7.07 +^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- a/storage/mroonga/CMakeLists.txt ++++ b/storage/mroonga/CMakeLists.txt +@@ -80,7 +80,7 @@ else() + set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) + endif() + +-file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) ++file(READ ${MRN_SOURCE_DIR}/ver MRN_VERSION) + file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) + file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) + file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO) +--- /dev/null ++++ b/storage/mroonga/ver +@@ -0,0 +1 @@ ++7.07 +\ No newline at end of file +--- a/storage/mroonga/version ++++ /dev/null +@@ -1 +0,0 @@ +-7.07 +\ No newline at end of file -- cgit 1.2.3-korg