From patchwork Fri Feb 12 19:20:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 582282 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id BDA4A14076E for ; Sat, 13 Feb 2016 06:22:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=GncEj0nf; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0D1C233B93; Fri, 12 Feb 2016 19:22:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id go6KKnx+HDFd; Fri, 12 Feb 2016 19:22:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C6BEB33BB7; Fri, 12 Feb 2016 19:22:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id B2BE11C1104 for ; Fri, 12 Feb 2016 19:22:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AE3DD959CB for ; Fri, 12 Feb 2016 19:22:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vnnnu3pA7PuY for ; Fri, 12 Feb 2016 19:22:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id C14E9959BE for ; Fri, 12 Feb 2016 19:22:19 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id c200so4373694wme.0 for ; Fri, 12 Feb 2016 11:22:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OSEkSbXUQeyaSNNtJdjZfRQrW0Qvk9IjwGgMobKdzPY=; b=GncEj0nfOKeOREaAEiNhfxv5P4BE2gfOlUjn6r/z4q2IXlaQs1cWGOYxRQ0NcFTK4v E9J6Wcm1wsXnliEUxECGh14muUR6id1aoIuNLs+uf+4w/9WySyVhW/t+IzaljAXDvVoQ zuIOy0Hdw59ruJT7FlM3A4qxEm1KLKqQMOd/Qnrr4WPC/gyaRncG4kn3502EM7DlrRmx OU1RLoQMHl9UC3MSONZ9XabQAlTIfcgYFBEauH0zYFeA3Utwe71HZXnXSci1ShTPTXDL k2vaYfNGRkAiMoR0ZNDSnRbRl6f+T5sA+DWhpL1Vv54e0fl8GA+xQxdCVEKmaOouTIpz vMag== 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:in-reply-to :references; bh=OSEkSbXUQeyaSNNtJdjZfRQrW0Qvk9IjwGgMobKdzPY=; b=HLLYTtgmnlrhv/UbDXklrbfXXvjS2ObTPNmNQiBFQQmcH6fMoaE5YAuCDDBq4Vwatq zc4zhMCEv2P6FamN+YK8aDcyBo9uSLoK4xhfN4pOVCL1XRPzgXOl/06urzlZ+m28BtB+ +GEoyGNbYGdlV20ZWxx4rUqf9zPan1O7O3BbQ0pT8RNYHyAYLfK7wDCDY991auAIbJhQ iJDPWz71+qtdMKXDKwhC/a2pXUjrdHJg5e5q+UYg2QWyTRZrZRFYfAV2QYztk9Fs8gOO tbzv5PgaxBg5GfYmQdRzpFayjYKBKweMmLJInkDrHWlLx1yzu2sK8+AO0O3YnDF0fpq+ h5dA== X-Gm-Message-State: AG10YORc6WzDA/aa1zQHYaPgZuqYaG8cCjJj6yChbueRtA9cVMQz+Kpde2V/OW5snuubJw== X-Received: by 10.28.183.137 with SMTP id h131mr5132454wmf.100.1455304938374; Fri, 12 Feb 2016 11:22:18 -0800 (PST) Received: from localhost.localdomain (d54C49339.access.telenet.be. [84.196.147.57]) by smtp.gmail.com with ESMTPSA id c7sm3635879wmd.13.2016.02.12.11.22.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Feb 2016 11:22:17 -0800 (PST) From: Thomas De Schampheleire To: buildroot@buildroot.org Date: Fri, 12 Feb 2016 20:20:26 +0100 Message-Id: <1455304826-10557-6-git-send-email-patrickdepinguin@gmail.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1455304826-10557-1-git-send-email-patrickdepinguin@gmail.com> References: <1455304826-10557-1-git-send-email-patrickdepinguin@gmail.com> Cc: thomas.petazzoni@free-electrons.com, Thomas De Schampheleire Subject: [Buildroot] [PATCH 5/5] toolchain-external: unify LIB_EXTERNAL_LIBS and USR_LIB_EXTERNAL_LIBS X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Thomas De Schampheleire With the alignment of toolchain library location in target and staging, there is no need anymore for the distinction between LIB_EXTERNAL_LIBS and USR_LIB_EXTERNAL_LIBS. Unify them into TOOLCHAIN_EXTERNAL_LIBS. Related, update the help text of BR2_TOOLCHAIN_EXTRA_TOOLCHAIN_EXTERNAL_LIBS. Signed-off-by: Thomas De Schampheleire Reviewed-by: Romain Naour Acked-by: Arnout Vandecappelle (Essensium/Mind) --- toolchain/toolchain-external/Config.in | 3 +-- toolchain/toolchain-external/toolchain-external.mk | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 7ba3929..9d81a2e 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -1006,8 +1006,7 @@ config BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS help If your external toolchain provides extra libraries that need to be copied to the target filesystem, enter them - here, separated by spaces. They will be copied to the - target's /lib directory. + here, separated by spaces. endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index a333c32..bd1a807 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -64,33 +64,33 @@ # of Buildroot is handled identical for the 2 toolchain types. ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) -LIB_EXTERNAL_LIBS += libatomic.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.* +TOOLCHAIN_EXTERNAL_LIBS += libatomic.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.* ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_ARM_EABIHF),yy) -LIB_EXTERNAL_LIBS += ld-linux-armhf.so.* +TOOLCHAIN_EXTERNAL_LIBS += ld-linux-armhf.so.* else -LIB_EXTERNAL_LIBS += ld*.so.* +TOOLCHAIN_EXTERNAL_LIBS += ld*.so.* endif ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIB_EXTERNAL_LIBS += libpthread.so.* +TOOLCHAIN_EXTERNAL_LIBS += libpthread.so.* ifneq ($(BR2_PACKAGE_GDB)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),) -LIB_EXTERNAL_LIBS += libthread_db.so.* +TOOLCHAIN_EXTERNAL_LIBS += libthread_db.so.* endif # gdbserver endif # ! no threads endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y) -LIB_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* +TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) -LIB_EXTERNAL_LIBS += libc.so libgcc_s.so.* +TOOLCHAIN_EXTERNAL_LIBS += libc.so libgcc_s.so.* endif ifeq ($(BR2_INSTALL_LIBSTDCPP),y) -USR_LIB_EXTERNAL_LIBS += libstdc++.so.* +TOOLCHAIN_EXTERNAL_LIBS += libstdc++.so.* endif -LIB_EXTERNAL_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS)) +TOOLCHAIN_EXTERNAL_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_TOOLCHAIN_EXTERNAL_LIBS)) # Details about sysroot directory selection. # @@ -593,7 +593,7 @@ endef define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS $(Q)if test -z "$(BR2_STATIC_LIBS)" ; then \ $(call MESSAGE,"Copying external toolchain libraries to target...") ; \ - for libs in $(LIB_EXTERNAL_LIBS) $(USR_LIB_EXTERNAL_LIBS); do \ + for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \ $(call copy_toolchain_lib_root,$$libs); \ done ; \ fi @@ -663,7 +663,7 @@ define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS_BFIN_FDPIC endef define TOOLCHAIN_EXTERNAL_INSTALL_BFIN_FDPIC $(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to target...") ; \ - for libs in $(LIB_EXTERNAL_LIBS) $(USR_LIB_EXTERNAL_LIBS); do \ + for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \ $(call copy_toolchain_lib_root,$$libs); \ done endef