diff options
| -rw-r--r-- | meta-oe/recipes-support/re2/re2_2024.03.01.bb (renamed from meta-oe/recipes-support/re2/re2_2023.03.01.bb) | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/re2/re2_2023.03.01.bb b/meta-oe/recipes-support/re2/re2_2024.03.01.bb index fe210d5107..192fe265f1 100644 --- a/meta-oe/recipes-support/re2/re2_2023.03.01.bb +++ b/meta-oe/recipes-support/re2/re2_2024.03.01.bb | |||
| @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/google/re2/" | |||
| 3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" |
| 5 | 5 | ||
| 6 | # tag 2023-03-01 | 6 | # tag 2024-03-01 |
| 7 | SRCREV = "241e2e430836e80f93d704d1f06cd3e7fe3100f5" | 7 | SRCREV = "2d866a3d0753f4f4fce93cccc6c59c4b052d7db4" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \ | 9 | SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \ |
| 10 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ | 10 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ |
| @@ -12,12 +12,17 @@ SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \ | |||
| 12 | 12 | ||
| 13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
| 14 | 14 | ||
| 15 | DEPENDS = "abseil-cpp ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest googlebenchmark', '', d)}" | ||
| 16 | |||
| 15 | inherit cmake ptest | 17 | inherit cmake ptest |
| 16 | RDEPENDS:${PN}-ptest += "cmake sed" | 18 | RDEPENDS:${PN}-ptest += "cmake sed" |
| 19 | RDEPENDS:${PN} += "abseil-cpp-dev" | ||
| 20 | |||
| 21 | INSANE_SKIP:${PN} += "dev-deps" | ||
| 17 | 22 | ||
| 18 | EXTRA_OECMAKE += " \ | 23 | EXTRA_OECMAKE += " \ |
| 19 | -DBUILD_SHARED_LIBS=ON \ | 24 | -DBUILD_SHARED_LIBS=ON \ |
| 20 | ${@bb.utils.contains('PTEST_ENABLED', '1', '-DRE2_BUILD_TESTING=ON', '-DRE2_BUILD_TESTING=OFF', d)} \ | 25 | ${@bb.utils.contains('PTEST_ENABLED', '1', '-DRE2_BUILD_TESTING=ON', '-DRE2_BUILD_TESTING=OFF', d)} \ |
| 21 | " | 26 | " |
| 22 | 27 | ||
| 23 | do_install_ptest () { | 28 | do_install_ptest () { |
| @@ -25,6 +30,8 @@ do_install_ptest () { | |||
| 25 | cp -r ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} | 30 | cp -r ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} |
| 26 | sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` | 31 | sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` |
| 27 | sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` | 32 | sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` |
| 33 | # 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] | ||
| 34 | cp -r ${B}/libtesting.so ${D}${PTEST_PATH} | ||
| 28 | } | 35 | } |
| 29 | 36 | ||
| 30 | # ignore .so in /usr/lib64 | 37 | # ignore .so in /usr/lib64 |
