From: Denys Dmytriyenko <[email protected]> Many toolchain components like gcc share common work directory with sources and rely on those sources being prepped by a corresponding -cross part. Since we use a prebuilt cross toolchain, we have to fake some prep steps for target toolchain components to build successfully (install unwind.h, etc.). Need to make sure those prep steps get executed before target gcc requires them.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../recipes-core/meta/external-linaro-toolchain-cross.bb | 8 +++++++- .../recipes-core/meta/external-linaro-toolchain.bbappend | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain-cross.bb b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain-cross.bb index d0b5bfe..d448f47 100644 --- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain-cross.bb +++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain-cross.bb @@ -3,10 +3,16 @@ SUMMARY = "Stage provided unwind.h header being used by target gcc installation" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" -PR = "r0" +PR = "r1" inherit cross +PN = "external-linaro-toolchain-cross-${TARGET_ARCH}" +BPN = "external-linaro-toolchain" + +INHIBIT_DEFAULT_DEPS = "1" +INHIBIT_AUTOTOOLS_DEPS = "1" + do_install() { install -d ${D}${libdir}/gcc/${TARGET_SYS}/${ELT_VER_GCC}/include/ cp -a ${TOOLCHAIN_PATH}/lib/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/include/unwind.h ${D}/${libdir}/gcc/${TARGET_SYS}/${ELT_VER_GCC}/include/ diff --git a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend index f382897..5155ffb 100644 --- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend +++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend @@ -4,7 +4,7 @@ ALLOW_EMPTY_ldd = "1" ALLOW_EMPTY_libstdc++ = "1" ALLOW_EMPTY_libgomp = "1" -PR_append = "-arago21" +PR_append = "-arago22" PROVIDES := "${@oe_filter_out('virtual/linux-libc-headers', '${PROVIDES}', d)}" PROVIDES := "${@oe_filter_out('linux-libc-headers', '${PROVIDES}', d)}" @@ -18,7 +18,7 @@ PACKAGES += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'exter DEPENDS += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-linaro-toolchain', '', 'linux-libc-headers', d)}" -do_build[depends] += "external-linaro-toolchain-cross:do_populate_sysroot" +DEPENDS += "external-linaro-toolchain-cross-${TARGET_ARCH}" RDEPENDS_${PN}-utils = "" -- 2.2.0 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
