| Message ID | 20231017171702.2964390-1-raj.khem@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe] leveldb: Upgrade to 1.23 plus latest git | expand |
On Tue, Oct 17, 2023 at 7:17 PM Khem Raj <raj.khem@gmail.com> wrote: > Switch to git submods as it needs gtest and benchmarks checked out at a > particular commit > But it probably shouldn't install gtest files as this now causes conflicts when leveldb is used in component which itself also depends on gtest e.g. leveldb-tl in meta-webosose: ERROR: lib32-leveldb-tl-0.1.6-r4 do_prepare_recipe_sysroot: The file /usr/lib/pkgconfig/gtest.pc is installed by both lib32-googletest and lib32-leveldb, aborting Without gtest enabled in leveldb-tl it fails a bit later: FAILED: mksandwich | : && /OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ --sysroot=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot -m64 -march=nehalem -mtune=generic -mfpmath=sse -msse4.2 --sysroot=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot-native= -fvisibility-inlines-hidden -std=c++14 -Wall -Wextra -Wconversion -Werror -m64 -march=nehalem -mtune=generic -mfpmath=sse -msse4.2 --sysroot=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot-native= -fvisibility-inlines-hidden -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fcanon-prefix-map -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot-native= -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fcanon-prefix-map -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot-native= -rdynamic CMakeFiles/mksandwich.dir/mksandwich.cpp.o -o mksandwich lib/libgtest.a lib/libgtest_main.a -lleveldb -lsnappy lib/libgtest.a && : | /OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot-native/usr/bin/x86_64-webos-linux/../../libexec/x86_64-webos-linux/gcc/x86_64-webos-linux/13.2.0/ld: CMakeFiles/mksandwich.dir/mksandwich.cpp.o:(.rodata._ZTIN7leveldb10AsIteratorINS_10SandwichDBINS_8BottomDBEtE4Part6WalkerEEE[_ZTIN7leveldb10AsIteratorINS_10SandwichDBINS_8BottomDBEtE4Part6WalkerEEE]+0x10): undefined reference to `typeinfo for leveldb::Iterator' | collect2: error: ld returned 1 exit status Will send a fix after fixing the 2nd issue as well.
I've sent a fix for the first part with gtest. The 2nd part is caused by: https://github.com/google/leveldb/commit/69061b464ab1da287da9b7ffec1ed911b754403b which is relatively easy to fix in leveldb-tl: https://github.com/webOS-ports/meta-webos-ports/commit/ada50397377dbdd471ed66fbcbfa5dbb8e3546d6 but a bit worse in db8: https://github.com/webOS-ports/meta-webos-ports/commit/b98d9d358914ecfbd7d9857fb7cfb05f6a47c90b but then 7 other recipes start failing as they are using db8 and use rtti. Maybe I'm just doing something silly (or too many silly things at the same time instead of sleep(), lets see tomorrow). On Fri, Oct 20, 2023 at 2:47 PM Martin Jansa via lists.openembedded.org <martin.jansa=gmail.com@lists.openembedded.org> wrote: > On Tue, Oct 17, 2023 at 7:17 PM Khem Raj <raj.khem@gmail.com> wrote: > >> Switch to git submods as it needs gtest and benchmarks checked out at a >> particular commit >> > > But it probably shouldn't install gtest files as this now causes conflicts > when leveldb is used in component which itself also depends on gtest e.g. > leveldb-tl in meta-webosose: > > ERROR: lib32-leveldb-tl-0.1.6-r4 do_prepare_recipe_sysroot: The file > /usr/lib/pkgconfig/gtest.pc is installed by both lib32-googletest and > lib32-leveldb, aborting > > Without gtest enabled in leveldb-tl it fails a bit later: > FAILED: mksandwich > | : && > /OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ > --sysroot=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot > -m64 -march=nehalem -mtune=generic -mfpmath=sse -msse4.2 > --sysroot=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot > -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map > -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= > -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot-native= > -fvisibility-inlines-hidden -std=c++14 -Wall -Wextra -Wconversion -Werror > -m64 -march=nehalem -mtune=generic -mfpmath=sse -msse4.2 > --sysroot=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot > -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map > -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= > -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot-native= > -fvisibility-inlines-hidden -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed > -fcanon-prefix-map > -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= > -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot-native= > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fcanon-prefix-map > -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/git=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/build=/usr/src/debug/leveldb-tl/1.0.6+git-r0 > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= > -fmacro-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot= > -fdebug-prefix-map=/OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot-native= > -rdynamic CMakeFiles/mksandwich.dir/mksandwich.cpp.o -o mksandwich > lib/libgtest.a lib/libgtest_main.a -lleveldb -lsnappy lib/libgtest.a > && : > | > /OE/build/luneos-scarthgap/tmp-glibc/work/corei7-64-webos-linux/leveldb-tl/1.0.6+git/recipe-sysroot-native/usr/bin/x86_64-webos-linux/../../libexec/x86_64-webos-linux/gcc/x86_64-webos-linux/13.2.0/ld: > CMakeFiles/mksandwich.dir/mksandwich.cpp.o:(.rodata._ZTIN7leveldb10AsIteratorINS_10SandwichDBINS_8BottomDBEtE4Part6WalkerEEE[_ZTIN7leveldb10AsIteratorINS_10SandwichDBINS_8BottomDBEtE4Part6WalkerEEE]+0x10): > undefined reference to `typeinfo for leveldb::Iterator' > | collect2: error: ld returned 1 exit status > > Will send a fix after fixing the 2nd issue as well. > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#105621): > https://lists.openembedded.org/g/openembedded-devel/message/105621 > Mute This Topic: https://lists.openembedded.org/mt/102022571/3617156 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ > martin.jansa@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
diff --git a/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb b/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb similarity index 89% rename from meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb rename to meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb index 6afc45ab7e..61fa02c154 100644 --- a/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb +++ b/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb @@ -4,14 +4,13 @@ HOMEPAGE = "https://github.com/google/leveldb" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d" -SRC_URI = "git://github.com/google/${BPN}.git;branch=main;protocol=https \ +SRC_URI = "gitsm://github.com/google/${BPN}.git;branch=main;protocol=https \ file://run-ptest" -SRCREV = "78b39d68c15ba020c0d60a3906fb66dbf1697595" +SRCREV = "068d5ee1a3ac40dabd00d211d5013af44be55bea" S = "${WORKDIR}/git" inherit cmake ptest - PACKAGECONFIG ??= "" PACKAGECONFIG[benchmarks] = "-DLEVELDB_BUILD_BENCHMARKS=ON,-DLEVELDB_BUILD_BENCHMARKS=OFF,sqlite" PACKAGECONFIG[snappy] = ",,snappy"
Switch to git submods as it needs gtest and benchmarks checked out at a particular commit Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../recipes-dbs/leveldb/{leveldb_1.22.bb => leveldb_1.23.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta-oe/recipes-dbs/leveldb/{leveldb_1.22.bb => leveldb_1.23.bb} (89%)