From bf30c08dd568edf0fe2e910efe228958b1afa1a3 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Thu, 7 Mar 2024 11:21:05 +0800 Subject: re2: Upgrade 2023.03.01 -> 2024.03.01 1, Add abseil-cpp, gtest and benchmark to DEPENDS to fix the below kind configure error. CMake Error at CMakeLists.txt:81 (find_package): By not providing "Findabsl.cmake" in CMAKE_MODULE_PATH this project has asked CMake to find a package configuration file provided by "absl", but CMake did not find one. Could not find a package configuration file provided by "absl" with any of the following names: abslConfig.cmake absl-config.cmake 2, Install libtesting.so to target to fix the below QA issue. ERROR: re2-2024.03.01-r0 do_package_qa: QA Issue: /usr/lib64/re2/ptest/string_generator_test contained in package re2-ptest requires libtesting.so()(64bit), but no providers found in RDEPENDS:re2-ptest? [file-rdeps] 3, Add abseil-cpp-dev to RDEPENDS to fix the below QA issue. ERROR: re2-2024.03.01-r0 do_package_qa: QA Issue: re2 rdepends on abseil-cpp-dev [dev-deps] 4, The ptest output as below: # ./run-ptest PASS: charclass_test PASS: compile_test PASS: filtered_re2_test PASS: mimics_pcre_test PASS: parse_test PASS: possible_match_test PASS: re2_test PASS: re2_arg_test PASS: regexp_test PASS: required_prefix_test PASS: search_test PASS: set_test PASS: simplify_test PASS: string_generator_test PASS: dfa_test PASS: exhaustive1_test PASS: exhaustive2_test PASS: exhaustive3_test PASS: exhaustive_test PASS: random_test Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- meta-oe/recipes-support/re2/re2_2023.03.01.bb | 37 ---------------------- meta-oe/recipes-support/re2/re2_2024.03.01.bb | 44 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 37 deletions(-) delete mode 100644 meta-oe/recipes-support/re2/re2_2023.03.01.bb create mode 100644 meta-oe/recipes-support/re2/re2_2024.03.01.bb (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/re2/re2_2023.03.01.bb b/meta-oe/recipes-support/re2/re2_2023.03.01.bb deleted file mode 100644 index fe210d510..000000000 --- a/meta-oe/recipes-support/re2/re2_2023.03.01.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "A regular expression library" -HOMEPAGE = "https://github.com/google/re2/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" - -# tag 2023-03-01 -SRCREV = "241e2e430836e80f93d704d1f06cd3e7fe3100f5" - -SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ - " - -S = "${WORKDIR}/git" - -inherit cmake ptest -RDEPENDS:${PN}-ptest += "cmake sed" - -EXTRA_OECMAKE += " \ - -DBUILD_SHARED_LIBS=ON \ - ${@bb.utils.contains('PTEST_ENABLED', '1', '-DRE2_BUILD_TESTING=ON', '-DRE2_BUILD_TESTING=OFF', d)} \ -" - -do_install_ptest () { - cp -r ${B}/*_test ${D}${PTEST_PATH} - cp -r ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} - sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` - sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` -} - -# ignore .so in /usr/lib64 -FILES:${PN} = "${libdir}" -INSANE_SKIP:${PN} += "dev-so" - -# Don't include so files in dev package -FILES:${PN}-dev = "${includedir} ${libdir}/cmake" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/re2/re2_2024.03.01.bb b/meta-oe/recipes-support/re2/re2_2024.03.01.bb new file mode 100644 index 000000000..192fe265f --- /dev/null +++ b/meta-oe/recipes-support/re2/re2_2024.03.01.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "A regular expression library" +HOMEPAGE = "https://github.com/google/re2/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" + +# tag 2024-03-01 +SRCREV = "2d866a3d0753f4f4fce93cccc6c59c4b052d7db4" + +SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ + " + +S = "${WORKDIR}/git" + +DEPENDS = "abseil-cpp ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest googlebenchmark', '', d)}" + +inherit cmake ptest +RDEPENDS:${PN}-ptest += "cmake sed" +RDEPENDS:${PN} += "abseil-cpp-dev" + +INSANE_SKIP:${PN} += "dev-deps" + +EXTRA_OECMAKE += " \ + -DBUILD_SHARED_LIBS=ON \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-DRE2_BUILD_TESTING=ON', '-DRE2_BUILD_TESTING=OFF', d)} \ +" + +do_install_ptest () { + cp -r ${B}/*_test ${D}${PTEST_PATH} + cp -r ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} + sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` + sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` + # ERROR: re2-2024.03.01-r0 do_package_qa: QA Issue: /usr/lib64/re2/ptest/string_generator_test contained in package re2-ptest requires libtesting.so()(64bit), but no providers found in RDEPENDS:re2-ptest? [file-rdeps] + cp -r ${B}/libtesting.so ${D}${PTEST_PATH} +} + +# ignore .so in /usr/lib64 +FILES:${PN} = "${libdir}" +INSANE_SKIP:${PN} += "dev-so" + +# Don't include so files in dev package +FILES:${PN}-dev = "${includedir} ${libdir}/cmake" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf