Skip to contentSkip to conversation

rocksdb: fix build error for DEBUG_BUILD

PATCH Applied Yi Zhao 2 participants 2 messages Apr 4, 2024 – Apr 7, 2024

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/1 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.

---
 meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb +2 -0
index 76d75f2b5..ee007acfa 100644
@@ -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
Signature · 1 line
2.25.1
Applied
#1 lore raw
Quoted 17 lines · Yi Zhao

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,           \
      | ^~~~~~~~~~~~~~~~
Quoted 1 line

[...]

Applied, thanks!

[1/1] rocksdb: fix build error for DEBUG_BUILD

      commit: 11c7659ecc5f8992740119bba6f20642d07cd03a

Best regards,

Signature · 1 line
Khem Raj <[email protected]>