summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-test
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-test')
-rw-r--r--meta-openembedded/meta-oe/recipes-test/bats/bats_1.11.0.bb (renamed from meta-openembedded/meta-oe/recipes-test/bats/bats_1.10.0.bb)2
-rw-r--r--meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb2
-rw-r--r--meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.14.0.bb7
3 files changed, 6 insertions, 5 deletions
diff --git a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.10.0.bb b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.11.0.bb
index d2a93e190b..f0615f7b79 100644
--- a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.10.0.bb
+++ b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.11.0.bb
@@ -10,7 +10,7 @@ SRC_URI = "\
"
# v1.10.0
-SRCREV = "f7defb94362f2053a3e73d13086a167448ea9133"
+SRCREV = "7531b575bb81487553553aecb654c41b237ae96c"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb b/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb
index ef1b6e537b..c5dfff2259 100644
--- a/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb
+++ b/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb
@@ -10,8 +10,6 @@ SRC_URI[sha256sum] = "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f489
inherit setuptools3
-PIP_INSTALL_DIST_PATH = "${B}/python/python3/dist"
-
SETUPTOOLS_SETUP_PATH = "${S}/python"
do_install:append() {
diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.14.0.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.14.0.bb
index 1b05f3d336..6546845715 100644
--- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.14.0.bb
+++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.14.0.bb
@@ -16,12 +16,15 @@ inherit cmake pkgconfig
#
PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,,"
+CXXFLAGS:append = " -fPIC"
ALLOW_EMPTY:${PN} = "1"
ALLOW_EMPTY:${PN}-dbg = "1"
-ALLOW_EMPTY:${PN}-staticdev = "1"
-RDEPENDS:${PN}-dev += "${PN}-staticdev"
+# -staticdev will not be implicitly put into an SDK, so we add an rdepend
+# if we are not building shared libraries
+#
+RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG","shared","","${PN}-staticdev",d)}"
BBCLASSEXTEND = "native nativesdk"