From: Denys Dmytriyenko <[email protected]> We build target compiler from sources, but use prebuilt Linaro for devkit. Since those use slightly different search paths, provide few symlinks as workarounds to satisfy both of the compiler's defaults.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../recipes-core/meta/external-linaro-toolchain.bbappend | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 aab6a3c..0f729b3 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 = "-arago25" +PR_append = "-arago26" PROVIDES := "${@oe_filter_out('virtual/linux-libc-headers', '${PROVIDES}', d)}" PROVIDES := "${@oe_filter_out('linux-libc-headers', '${PROVIDES}', d)}" @@ -93,7 +93,7 @@ FILES_libgcc-dev += "\ " FILES_libstdc++-dev += "\ - /include/c++/ \ + /include/c++ \ " FILES_libgomp-dev += "\ @@ -120,11 +120,14 @@ do_install_append() { echo -e "/lib\n/usr/lib" >> ${D}${sysconfdir}/ld.so.conf 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}${includedir} + cp -a ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/include/* ${D}${includedir} + ln -sf ${ELT_TARGET_SYS} ${D}${includedir}/c++/${ELT_VER_GCC}/${TARGET_SYS} + ln -sf ../usr/include/c++ ${D}/include/c++ install -d ${D}${libdir}/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/include cp -a ${TOOLCHAIN_PATH}/${base_libdir}/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/include/omp.h ${D}${libdir}/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/include + ln -sf ${ELT_TARGET_SYS} ${D}${libdir}/gcc/${TARGET_SYS} ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-linaro-toolchain', '', 'rm -rf ${D}${includedir}/asm*; rm -rf ${D}${includedir}/drm; rm -rf ${D}${includedir}/linux; rm -rf ${D}${includedir}/mtd; rm -rf ${D}${includedir}/rdma; rm -rf ${D}${includedir}/sound; rm -rf ${D}${includedir}/video', d)} ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-linaro-toolchain', '', 'rm -rf ${D}${includedir}/uapi/.install; rm -rf ${D}${includedir}/misc/.install; rm -rf ${D}${includedir}/misc/cxl.h; rm -rf ${D}${includedir}/scsi/.install; rm -rf ${D}${includedir}/scsi/scsi_netlink*; rm -rf ${D}${includedir}/scsi/scsi_bsg*; rm -rf ${D}${includedir}/scsi/fc; rm -rf ${D}${includedir}/xen', d)} -- 2.2.0 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
