diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2023-01-26 13:04:07 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-01-26 13:10:37 -0800 |
| commit | 91129b0c94124fa4042521d590dd6b9b1245f78e (patch) | |
| tree | 73a56ac312eae33f27274ee8aed8dd6f30c0d703 /meta-oe | |
| parent | 0f942d1f2f93334b106c0ff60363fdef361db5b4 (diff) | |
| download | meta-openembedded-contrib-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>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb | 1 |
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 @@ +From cedc84a8db468d0b6652e78a8a6667e655586b53 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 13:00:43 -0800 +Subject: [PATCH] cmake: Do not add -msse4.2 -mpclmul on clang + +When testcase is compiled with clang and -msse4.2 -mpclmul is added to +cxxflags then clang -m32 still ends up compiling the test case which is +not correct for i386, therefore depend on yocto to pass the right flags +from environemnt via cflags rather than manufecture them here + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dbef059028..981545a4e0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -290,7 +290,7 @@ endif() + + include(CheckCXXSourceCompiles) + set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) +-if(NOT MSVC) ++if(NOT MSVC AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul") + endif() + +-- +2.39.1 + 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 file://0001-cmake-Add-check-for-atomic-support.patch \ file://0001-cmake-Use-exported-target-for-bz2.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ + file://0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch \ file://ppc64.patch \ file://mips.patch \ file://arm.patch \ |