From patchwork Thu Sep 22 00:32:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 673101 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sfcvG3qX0z9sQw for ; Thu, 22 Sep 2016 10:34:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=K4MXt22s; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bmrwL-0005U6-Ad; Thu, 22 Sep 2016 00:32:37 +0000 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bmrwH-0005SF-Tp for lede-dev@lists.infradead.org; Thu, 22 Sep 2016 00:32:35 +0000 Received: by mail-pf0-x242.google.com with SMTP id 6so2995105pfl.2 for ; Wed, 21 Sep 2016 17:32:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=evelD65beTj5gYgLfAkl6M+gkT8lhdnca+eX7PJjjLY=; b=K4MXt22sCftlpDS9dqCD/vS6mi9SoxfwbHyEoMSbwTaL9nS5B8XPlfQqhcxvqoG+xg EE8sh/sD8qwuLYi1CCIQFNsjguWZgwYx3n6IvP80rDn3Idf4c1x4siPfx5hikF82kaWo ZwTnCmH3qbkqWwL1N3DqIooeGoiOg2PMsTNijGvkFsCEfSyKM4cU4DeWoG4wInD8CnLJ FgygWSSQ2/k9kkGZ1INTLnXZ6UJ24pYd2fM0gYVa8pxgp0h+tzOjJHw45SRJ4mC0cjQ5 6yQAC/jhvzkObRBVpdecUgnaUQLhMM9C7mVsFjXD3ZWrhIP5oB9JgsdVqltpqQDkivjh 5NSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=evelD65beTj5gYgLfAkl6M+gkT8lhdnca+eX7PJjjLY=; b=OVWRyLz+ECEC1iPAhlCoICHjNvNQVhmjGz2u1lTg9BsMzw4XaemwzKt0GFCTXyjxPG t/Zofn60KjvSpb/k3auNo+5NaUTb2tIzPPoXY8IAmN0flpFqv/74oIb4SqNu+8EIW3iA cd2g3xfFxzehdsWfRD5rUWzh2Jg6G/gl3tvpsAwsanEAi+OGwMzzqtRbXP9Is/wc+myS jeH3U8JKqnLpwcG/6QMLcS8xVppggVp0yp6/9Hq6m7w4s/TczMUhx/uMOTA5apKysRXr ZxHzEvHM1F88S6dySNH1ZJHrL38dyou5ghv6CnJCj3ccqEQXtbv3T7YSsNlXtbXxNS9t qxGA== X-Gm-Message-State: AE9vXwNLMHI+2+RVMQk/SXtkSZZTxroTXjlvBoNcLhsRuKxJNmaaiYUfbBF6PStu7fWm7A== X-Received: by 10.98.58.65 with SMTP id h62mr69770178pfa.82.1474504333090; Wed, 21 Sep 2016 17:32:13 -0700 (PDT) Received: from stb-bld-03.irv.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by smtp.gmail.com with ESMTPSA id z187sm480959pfz.39.2016.09.21.17.32.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Sep 2016 17:32:12 -0700 (PDT) From: Florian Fainelli X-Google-Original-From: Florian Fainelli To: lede-dev@lists.infradead.org Date: Wed, 21 Sep 2016 17:32:10 -0700 Message-Id: <20160922003210.31947-1-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.9.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160921_173234_088072_1AABBE96 X-CRM114-Status: UNSURE ( 8.45 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:400e:c00:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (f.fainelli[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH] toolchain: Force installation into /lib X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Fainelli , john@phrozen.org, nbd@nbd.name MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Florian Fainelli For 64-bit capable systems, a symbolic link is set up for /lib64 to point to /lib, so make sure the installation goes into /lib, irrespective of where the C library files come from in an external toolchain. Signed-off-by: Florian Fainelli --- package/libs/toolchain/Makefile | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile index 75a3f3553995..0101b81a318b 100644 --- a/package/libs/toolchain/Makefile +++ b/package/libs/toolchain/Makefile @@ -484,71 +484,63 @@ else define Package/libgcc/install for file in $(call qstrip,$(CONFIG_LIBGCC_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef define Package/libgfortran/install for file in $(call qstrip,$(CONFIG_LIBGFORTRAN_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBGFORTRAN_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBGFORTRAN_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done endef define Package/libssp/install for file in $(call qstrip,$(CONFIG_LIBSSP_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBSSP_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBSSP_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef define Package/libstdcpp/install for file in $(call qstrip,$(CONFIG_LIBSTDCPP_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBSTDCPP_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBSTDCPP_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef define Package/libc/install for file in $(call qstrip,$(CONFIG_LIBC_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBC_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef define Package/libpthread/install for file in $(call qstrip,$(CONFIG_LIBPTHREAD_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBPTHREAD_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBPTHREAD_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef define Package/librt/install for file in $(call qstrip,$(CONFIG_LIBRT_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBRT_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBRT_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef define Package/libatomic/install for file in $(call qstrip,$(CONFIG_LIBATOMIC_FILE_SPEC)); do \ - dir=`dirname $$$$file` ; \ - $(INSTALL_DIR) $(1)/$$$$dir ; \ - $(CP) $(call qstrip,$(CONFIG_LIBATOMIC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + $(INSTALL_DIR) $(1)/lib ; \ + $(CP) $(call qstrip,$(CONFIG_LIBATOMIC_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \ exit 0 endef