From bdeb3ecf73e8994ac90e30d1f032f45580640871 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 16 Aug 2023 09:36:52 +0800 Subject: googletest: upgrade 1.13.0 -> 1.14.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-test/googletest/googletest_1.13.0.bb | 28 ---------------------- .../recipes-test/googletest/googletest_1.14.0.bb | 28 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 meta-oe/recipes-test/googletest/googletest_1.13.0.bb create mode 100644 meta-oe/recipes-test/googletest/googletest_1.14.0.bb diff --git a/meta-oe/recipes-test/googletest/googletest_1.13.0.bb b/meta-oe/recipes-test/googletest/googletest_1.13.0.bb deleted file mode 100644 index 2327f85d46..0000000000 --- a/meta-oe/recipes-test/googletest/googletest_1.13.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Google's framework for writing C++ tests" -HOMEPAGE = "https://github.com/google/googletest" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" - -PROVIDES += "gmock gtest" - -S = "${WORKDIR}/git" -SRCREV = "b796f7d44681514f58a683a3a71ff17c94edb0c1" -SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https" - -inherit cmake - -ALLOW_EMPTY:${PN} = "1" -ALLOW_EMPTY:${PN}-dbg = "1" - -RDEPENDS:${PN}-dev += "${PN}-staticdev" - -BBCLASSEXTEND = "native nativesdk" - -do_configure:prepend() { - # explicitly use python3 - # the scripts are already python3 compatible since https://github.com/google/googletest/commit/d404af0d987a9c38cafce82a7e26ec8468c88361 and other fixes like this - # but since this oe-core change http://git.openembedded.org/openembedded-core/commit/?id=5f8f16b17f66966ae91aeabc23e97de5ecd17447 - # there isn't python in HOSTTOOLS so "env python" fails - sed -i 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@g' ${S}/googlemock/test/*py ${S}/googletest/test/*py -} diff --git a/meta-oe/recipes-test/googletest/googletest_1.14.0.bb b/meta-oe/recipes-test/googletest/googletest_1.14.0.bb new file mode 100644 index 0000000000..8c75f936de --- /dev/null +++ b/meta-oe/recipes-test/googletest/googletest_1.14.0.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Google's framework for writing C++ tests" +HOMEPAGE = "https://github.com/google/googletest" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" + +PROVIDES += "gmock gtest" + +S = "${WORKDIR}/git" +SRCREV = "f8d7d77c06936315286eb55f8de22cd23c188571" +SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https" + +inherit cmake + +ALLOW_EMPTY:${PN} = "1" +ALLOW_EMPTY:${PN}-dbg = "1" + +RDEPENDS:${PN}-dev += "${PN}-staticdev" + +BBCLASSEXTEND = "native nativesdk" + +do_configure:prepend() { + # explicitly use python3 + # the scripts are already python3 compatible since https://github.com/google/googletest/commit/d404af0d987a9c38cafce82a7e26ec8468c88361 and other fixes like this + # but since this oe-core change http://git.openembedded.org/openembedded-core/commit/?id=5f8f16b17f66966ae91aeabc23e97de5ecd17447 + # there isn't python in HOSTTOOLS so "env python" fails + sed -i 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@g' ${S}/googlemock/test/*py ${S}/googletest/test/*py +} -- cgit v1.2.3-54-g00ecf