From: Denys Dmytriyenko <[email protected]> Target compiler is being built from sources, while the rest of the toolchain pieces, like runtimes and header files, are picked up from a prebuilt Linaro release, which uses slightly different paths for C++ headers.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-arago-distro/recipes-devtools/gcc/gcc_linaro-4.7.bbappend | 5 ++++- .../recipes-core/meta/external-linaro-toolchain.bbappend | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-arago-distro/recipes-devtools/gcc/gcc_linaro-4.7.bbappend b/meta-arago-distro/recipes-devtools/gcc/gcc_linaro-4.7.bbappend index 91db51a..d86c0d9 100644 --- a/meta-arago-distro/recipes-devtools/gcc/gcc_linaro-4.7.bbappend +++ b/meta-arago-distro/recipes-devtools/gcc/gcc_linaro-4.7.bbappend @@ -1,4 +1,7 @@ -PR_append = "-arago0" +PR_append = "-arago1" + +EXTRA_OECONF_PATHS_remove = "--with-gxx-include-dir=${includedir}/c++/" +EXTRA_OECONF_PATHS += "--with-gxx-include-dir=/include/c++/${BINV}/" FILES_${PN} = "\ ${bindir}/${TARGET_PREFIX}gcc* \ 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 de4c43c..2d04861 100644 --- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend +++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend @@ -10,7 +10,7 @@ INSANE_SKIP_libitm += "ldflags textrel" ALLOW_EMPTY_${PN}-utils = "1" ALLOW_EMPTY_ldd = "1" -PR_append = "-arago9" +PR_append = "-arago10" PROVIDES := "${@oe_filter_out('virtual/linux-libc-headers', '${PROVIDES}', d)}" PROVIDES := "${@oe_filter_out('linux-libc-headers', '${PROVIDES}', d)}" @@ -109,6 +109,7 @@ FILES_libgcc-dev += " \ do_install_append() { install -d ${D}/include cp -a ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/include/* ${D}/include + ln -sf ${ELT_TARGET_SYS} ${D}/include/c++/${ELT_VER_GCC}/${TARGET_SYS} install -d ${D}/${libdir}/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/ cp -a ${TOOLCHAIN_PATH}/${base_libdir}/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/*.o ${D}/${libdir}/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/ -- 2.2.0 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
