aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2024-04-04 20:51:18 +0800
committerKhem Raj <raj.khem@gmail.com>2024-04-04 10:41:47 -0700
commit11c7659ecc5f8992740119bba6f20642d07cd03a (patch)
treeaeac5c92c3030e1e4850fd85a9f6faed55e71ad8
parenta6bcdca5b4681906b00e12f6bc4af465c85bad9f (diff)
downloadmeta-openembedded-11c7659ecc5f8992740119bba6f20642d07cd03a.tar.gz
rocksdb: fix build error for DEBUG_BUILD
It fails to build rocksdb when '-Og' is set in CXXFLAGS (e.g. DEBUG_BUILD = '1' in local.conf): rocksdb/9.0.0/git/util/xxhash.h:4491:1: error: inlining failed in call to 'always_inline' 'void XXH3_scrambleAcc_sse2(void*, const void*)': function not considered for inlining 4491 | XXH3_scrambleAcc_sse2(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret) | ^~~~~~~~~~~~~~~~~~~~~ rocksdb/9.0.0/git/util/xxhash.h:5139:19: note: called from here 5139 | f_scramble(acc, secret + secretSize - XXH_STRIPE_LEN); | ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ rocksdb/9.0.0/git/util/xxhash.h:4177:1: error: inlining failed in call to 'always_inline' 'void XXH3_accumulate_sse2(xxh_u64*, const xxh_u8*, const xxh_u8*, size_t)': function not considered for inlining 4177 | XXH3_accumulate_##name(xxh_u64* XXH_RESTRICT acc, \ | ^~~~~~~~~~~~~~~~ Check and disable inlining when "-Og" is present. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb
index 76d75f2b55..ee007acfac 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb
@@ -44,6 +44,8 @@ EXTRA_OECMAKE = "\
-DFAIL_ON_WARNINGS=OFF \
"
+CXXFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}"
+
do_install:append() {
# Fix for qa check buildpaths
sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/rocksdb/RocksDBTargets.cmake