summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-dbs
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-07 08:36:33 -0700
commitffdb7f2aaeb2cc644d9be258886447bd2b4091a7 (patch)
treec9473ce2f4e9bddb672db84a3d1e1399972a6c97 /meta-oe/recipes-dbs
parent167d9f39d07da133fda786b7be40f2b8275e2d5f (diff)
downloadmeta-openembedded-ffdb7f2aaeb2cc644d9be258886447bd2b4091a7.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>
Diffstat (limited to 'meta-oe/recipes-dbs')
-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 = "\
44 -DFAIL_ON_WARNINGS=OFF \ 44 -DFAIL_ON_WARNINGS=OFF \
45" 45"
46 46
47CXXFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}"
48
47do_install:append() { 49do_install:append() {
48 # Fix for qa check buildpaths 50 # Fix for qa check buildpaths
49 sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/rocksdb/RocksDBTargets.cmake 51 sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/rocksdb/RocksDBTargets.cmake