diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-04 12:19:57 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-08 12:28:14 +0300 |
commit | 583341f6ea2439f58ffcbf4e06070aeb9472ec08 (patch) | |
tree | 8872290b2a6f6dd4c63376e54dec20dcb0fcb93d | |
parent | 6169682e3706a203538ce7d6d781d87a40b05dfb (diff) | |
download | meta-boot2qt-583341f6ea2439f58ffcbf4e06070aeb9472ec08.tar.gz |
Get rid of some of the host tools in toolchain
pkg-config got installed to toolchain, which made qtwebengine
build fail, as it tries to use it for host libs.
perl and bison are not working correctly from toolchain, they
have problems with sdk relocation.
Change-Id: I7755f4599ad7c87b60d5bfc66e0a2cf13fec9330
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
-rw-r--r-- | recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb | 2 | ||||
-rw-r--r-- | recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb index 0c0214f..3f13aef 100644 --- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb +++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb | |||
@@ -26,7 +26,7 @@ LICENSE = "CLOSED" | |||
26 | 26 | ||
27 | inherit populate_sdk | 27 | inherit populate_sdk |
28 | 28 | ||
29 | TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-toolchain-host" | 29 | TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-host packagegroup-cross-canadian-${MACHINE}" |
30 | TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-toolchain-target" | 30 | TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-toolchain-target" |
31 | 31 | ||
32 | 32 | ||
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index 971cc01..f64c0ac 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | |||
@@ -27,11 +27,8 @@ LICENSE = "CLOSED" | |||
27 | inherit nativesdk packagegroup | 27 | inherit nativesdk packagegroup |
28 | 28 | ||
29 | RDEPENDS_${PN} = "\ | 29 | RDEPENDS_${PN} = "\ |
30 | nativesdk-packagegroup-sdk-host \ | ||
31 | nativesdk-python-modules \ | 30 | nativesdk-python-modules \ |
32 | nativesdk-python-misc \ | 31 | nativesdk-python-misc \ |
33 | nativesdk-perl-modules \ | ||
34 | nativesdk-bison \ | ||
35 | nativesdk-gperf \ | 32 | nativesdk-gperf \ |
36 | ${@base_contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland", "", d)} \ | 33 | ${@base_contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland", "", d)} \ |
37 | ${MACHINE_EXTRA_INSTALL_SDK_HOST} \ | 34 | ${MACHINE_EXTRA_INSTALL_SDK_HOST} \ |