[oe-commits] [meta-openembedded] 34/52: googletest: fix build with newer oe-core without python in HOSTTOOLS
git at git.openembedded.org
git at git.openembedded.org
Thu Dec 12 00:23:31 UTC 2019
This is an automated email from the git hooks/post-receive script.
khem pushed a commit to branch master-next
in repository meta-openembedded.
commit 68be5fe160d4c4770fe87900f069de57d966ab03
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Tue Dec 10 13:08:08 2019 +0100
googletest: fix build with newer oe-core without python in HOSTTOOLS
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
meta-oe/recipes-test/googletest/googletest_git.bb | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-oe/recipes-test/googletest/googletest_git.bb
index b675ea0..354e7de 100644
--- a/meta-oe/recipes-test/googletest/googletest_git.bb
+++ b/meta-oe/recipes-test/googletest/googletest_git.bb
@@ -21,3 +21,11 @@ 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 at g' ${S}/googlemock/scripts/*py ${S}/googlemock/scripts/generator/*py ${S}/googlemock/scripts/generator/cpp/*py ${S}/googlemock/test/*py ${S}/googletest/scripts/*py ${S}/googletest/test/*py
+}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list