From patchwork Sun Oct 27 13:37:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1185010 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mind.be Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind-be.20150623.gappssmtp.com header.i=@mind-be.20150623.gappssmtp.com header.b="U/ji98NJ"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 471Jnq2ScKz9sCJ for ; Mon, 28 Oct 2019 00:38:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8C3A08709D; Sun, 27 Oct 2019 13:38:05 +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 K83PL6-S+3PA; Sun, 27 Oct 2019 13:38:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id CA5D887089; Sun, 27 Oct 2019 13:38:03 +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 E154C1BF3E9 for ; Sun, 27 Oct 2019 13:38:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A30D287089 for ; Sun, 27 Oct 2019 13:38:01 +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 NCfy078XzM5a for ; Sun, 27 Oct 2019 13:38:00 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 2D2FD8700E for ; Sun, 27 Oct 2019 13:38:00 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id t16so7157145wrr.1 for ; Sun, 27 Oct 2019 06:38:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind-be.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DSrzQdR6Szly20Xqvt52Uxgqi1hDv6gXw1leVz86zwI=; b=U/ji98NJfBPOfYzwVnD5xuRuGzxbKgY/W0pJxb9/aeth1knj++IMqsWZ65ORwJkoRF B1ZKuvFkBIGbDyl6ptw5Ki1JWB4cYZq3MtZC3jdo5cgIE67lZ4xe35SfIq5+p1xasfvr kjc1k6FUSOOIYDVBTa9AJbCBfX6dPLJK1L3hxfeaDfaD1tIlrBVSoRhRv+9e0geJQw5Z fllLx3twH9n+2b/rog5vUcA0fYD5GcT5I4AoijLZcDSeoicvdTPFbEvyr9UF+rgWorDE 9AEwah1pfbfybHXk2U+UmMHYF3riOx5xF3/aaghIiB1qeVCx5wN/TGN4aGAQn8NPlPvr 8NFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DSrzQdR6Szly20Xqvt52Uxgqi1hDv6gXw1leVz86zwI=; b=lWCGQAGwSvncXoJHn3RhKRdwP5ZnLATCS0NSKLtpXEzO82ia0Nn+M2ikQ3zWUZS/vn U2g6exfc/na9rnL3qkz8oNyevAWDQ3BeVq4z4LUhMdRiczmusLVZudtme8aDLi/hMtbg NYuCk8sX+onBnpk3uc9RKoeuA30ffUEWfeXV7m9eGGWCLCeaY6auMerdxfUVn4T7M65W cLx/epOrjcJ27Pehxqj5hxxh3kUbai4Nbzx049Jp/M8c/qUdx7iVJAhooDmeCAds3Nqh g6Z7HJbaQsdxk2oT1S0gBB1MpYGgiD/8yjcJ9lrng7594BnrAKLr5QRKfWUQsWz6xsBi 3JvA== X-Gm-Message-State: APjAAAUMO1aE+IpELYRGDUAODoe6mP5VCztbGnBRaDaZ0O7huA292d7p ao4vDoEURkJhMSv24jIh53CdqSJ21yU4PJnS X-Google-Smtp-Source: APXvYqzHTJzREBl3x1qIJjpka4HLsCvrq3ScoVfx8sPvDsnRzHszPP0LRNLJtYBd5JfUGPHHRKDp/Q== X-Received: by 2002:a05:6000:1621:: with SMTP id v1mr10096061wrb.62.1572183477831; Sun, 27 Oct 2019 06:37:57 -0700 (PDT) Received: from arnoutx1.lyon.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id o25sm9696971wro.21.2019.10.27.06.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 06:37:57 -0700 (PDT) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Sun, 27 Oct 2019 14:37:56 +0100 Message-Id: <20191027133756.14299-1-arnout@mind.be> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] toolchain/toolchain: set TOOLCHAIN_INSTALL_STAGING only once X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, we set TOOLCHAIN_INSTALL_STAGING three times: once (conditionally) in toolchain.mk, and once each (unconditionally) in pkg-cmake.mk and pkg-meson.mk. This is a little bit messy... Set it just once, unconditionally, in toolchain.mk where it belongs. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-cmake.mk | 1 - package/pkg-meson.mk | 1 - toolchain/toolchain/toolchain.mk | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index b9ce8ff622..57bfea9be5 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -272,4 +272,3 @@ define TOOLCHAIN_CMAKE_INSTALL_FILES endef TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_CMAKE_INSTALL_FILES -TOOLCHAIN_INSTALL_STAGING = YES diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 2189565440..b11bc3a7c0 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -206,4 +206,3 @@ define PKG_MESON_INSTALL_CROSS_CONF endef TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += HOST_MESON_INSTALL_CROSS_CONF -TOOLCHAIN_INSTALL_STAGING = YES diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index 17fb62147e..0afb12c036 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -11,6 +11,7 @@ TOOLCHAIN_DEPENDENCIES += toolchain-external endif TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO +TOOLCHAIN_INSTALL_STAGING = YES # Apply a hack that Rick Felker suggested[1] to avoid conflicts between libc # headers and kernel headers. This is needed for kernel headers older than @@ -34,7 +35,6 @@ define TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK $(STAGING_DIR)/usr/include/linux/libc-compat.h endef TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK -TOOLCHAIN_INSTALL_STAGING = YES endif # Install default nsswitch.conf file if the skeleton doesn't provide it