Return-Path: Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.17]) by arago-project.org (Postfix) with ESMTPS id 45DCE52AA7 for ; Mon, 13 Feb 2017 23:04:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id E246E20B98; Mon, 13 Feb 2017 23:04:26 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo03-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OR1Va_vBie8l; Mon, 13 Feb 2017 23:04:26 +0000 (UTC) Received: from mail.denix.org (pool-100-15-95-79.washdc.fios.verizon.net [100.15.95.79]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id B9F9E20B52; Mon, 13 Feb 2017 23:04:25 +0000 (UTC) Received: from gimli.denix (pippin [192.168.0.6]) by mail.denix.org (Postfix) with ESMTP id 14D71162372; Mon, 13 Feb 2017 18:04:25 -0500 (EST) From: Denys Dmytriyenko To: meta-arago@arago-project.org Date: Mon, 13 Feb 2017 18:04:06 -0500 Message-Id: <1487027048-101336-2-git-send-email-denys@ti.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487027048-101336-1-git-send-email-denys@ti.com> References: <1487027048-101336-1-git-send-email-denys@ti.com> Subject: [morty/master][PATCH 2/4] external-linaro-toolchain: only make supporting symlinks when ELT_TARGET_SYS != TARGET_SYS X-BeenThere: meta-arago@arago-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Arago metadata layer for TI SDKs - OE-Core/Yocto compatible List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2017 23:04:30 -0000 E.g. when Linaro uses "arm-linux-gnueabihf", while OE expects "arm-linux-gnueabi" instead. The links are there to allow OE-built compiler to re-use Linaro-provided runtime. When their TARGET_SYS matches, there's no need for the links. Signed-off-by: Denys Dmytriyenko --- .../recipes-core/meta/external-linaro-toolchain.bbappend | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 5f42413..31f5ba0 100644 --- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend +++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend @@ -141,12 +141,16 @@ do_install_append() { install -d ${D}/include 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} + if [ ${ELT_TARGET_SYS} != ${TARGET_SYS} ]; then + ln -sf ${ELT_TARGET_SYS} ${D}${includedir}/c++/${ELT_VER_GCC}/${TARGET_SYS} + fi ln -sf ../usr/include/c++ ${D}/include/c++ install -d ${D}${libdir}/gcc/${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/${TARGET_SYS}/${ELT_VER_GCC}/include - ln -sf ${TARGET_SYS} ${D}${libdir}/gcc/${ELT_TARGET_SYS} + if [ ${ELT_TARGET_SYS} != ${TARGET_SYS} ]; then + ln -sf ${TARGET_SYS} ${D}${libdir}/gcc/${ELT_TARGET_SYS} + fi ${@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/cxlflash_ioctl.h; rm -rf ${D}${includedir}/scsi/fc; rm -rf ${D}${includedir}/xen', d)} -- 2.7.4