summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-01-26 13:04:07 -0800
committerKhem Raj <raj.khem@gmail.com>2023-01-26 13:10:37 -0800
commit91129b0c94124fa4042521d590dd6b9b1245f78e (patch)
tree73a56ac312eae33f27274ee8aed8dd6f30c0d703
parent0f942d1f2f93334b106c0ff60363fdef361db5b4 (diff)
downloadmeta-openembedded-91129b0c94124fa4042521d590dd6b9b1245f78e.tar.gz
rocksdb: Fix build with clang compiler
Need to drop using -msse4.2 -mpclmul Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch33
-rw-r--r--meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch
new file mode 100644
index 0000000000..e521854439
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch
@@ -0,0 +1,33 @@
1From cedc84a8db468d0b6652e78a8a6667e655586b53 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 26 Jan 2023 13:00:43 -0800
4Subject: [PATCH] cmake: Do not add -msse4.2 -mpclmul on clang
5
6When testcase is compiled with clang and -msse4.2 -mpclmul is added to
7cxxflags then clang -m32 still ends up compiling the test case which is
8not correct for i386, therefore depend on yocto to pass the right flags
9from environemnt via cflags rather than manufecture them here
10
11Upstream-Status: Inappropriate [OE-Specific]
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 CMakeLists.txt | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/CMakeLists.txt b/CMakeLists.txt
19index dbef059028..981545a4e0 100644
20--- a/CMakeLists.txt
21+++ b/CMakeLists.txt
22@@ -290,7 +290,7 @@ endif()
23
24 include(CheckCXXSourceCompiles)
25 set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
26-if(NOT MSVC)
27+if(NOT MSVC AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
28 set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul")
29 endif()
30
31--
322.39.1
33
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb
index 29f234d6ec..8faaee40f6 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb
@@ -13,6 +13,7 @@ SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=htt
13 file://0001-cmake-Add-check-for-atomic-support.patch \ 13 file://0001-cmake-Add-check-for-atomic-support.patch \
14 file://0001-cmake-Use-exported-target-for-bz2.patch \ 14 file://0001-cmake-Use-exported-target-for-bz2.patch \
15 file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ 15 file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
16 file://0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch \
16 file://ppc64.patch \ 17 file://ppc64.patch \
17 file://mips.patch \ 18 file://mips.patch \
18 file://arm.patch \ 19 file://arm.patch \