From patchwork Wed Apr 12 09:38:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 749859 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w2zVC22Ddz9sNJ for ; Wed, 12 Apr 2017 19:42:26 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AB4A88845A; Wed, 12 Apr 2017 09:42:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rNhjOHMh6Z99; Wed, 12 Apr 2017 09:42:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 07D9388314; Wed, 12 Apr 2017 09:40:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 280D11CE493 for ; Wed, 12 Apr 2017 09:40:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E7CCA2F4D0 for ; Wed, 12 Apr 2017 09:40:12 +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 KttGHrf6ifbI for ; Wed, 12 Apr 2017 09:40:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from exchange.essensium.com (220.77.144.195.ipv4.evonet.be [195.144.77.220]) by silver.osuosl.org (Postfix) with ESMTPS id 6C6432F0C0 for ; Wed, 12 Apr 2017 09:40:05 +0000 (UTC) Received: from vandecaa-laptop.local.ess-mail.com (10.3.4.128) by beleexch01.local.ess-mail.com (10.3.7.8) with Microsoft SMTP Server (TLS) id 15.0.847.32; Wed, 12 Apr 2017 11:39:44 +0200 From: "Arnout Vandecappelle (Essensium/Mind)" To: Date: Wed, 12 Apr 2017 11:38:47 +0200 Message-ID: <20170412093928.1006-14-arnout@mind.be> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170412093928.1006-1-arnout@mind.be> References: <20170412093928.1006-1-arnout@mind.be> MIME-Version: 1.0 X-Originating-IP: [10.3.4.128] X-ClientProxiedBy: beleexch01.local.ess-mail.com (10.3.7.8) To beleexch01.local.ess-mail.com (10.3.7.8) Subject: [Buildroot] [PATCH 13/53] pkg-cmake: move configuration files out of $(HOST_DIR)/usr 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Move toolchainfile.cmake and Buildroot.cmake from $(HOST_DIR)/usr/share/buildroot to $(HOST_DIR)/share/buildroot. Build-tested with a bunch of cmake packages. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-cmake.mk | 8 ++++---- support/misc/toolchainfile.cmake.in | 4 ++-- toolchain/toolchain/toolchain.mk | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 0606d26ad7..1bb3652a13 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -86,7 +86,7 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \ + -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DBUILD_DOC=OFF \ @@ -234,10 +234,10 @@ CMAKE_SYSTEM_PROCESSOR = $(BR2_ARCH) endif # In order to allow the toolchain to be relocated, we calculate the HOST_DIR -# based on the toolchainfile.cmake file's location: $(HOST_DIR)/usr/share/buildroot +# based on the toolchainfile.cmake file's location: $(HOST_DIR)/share/buildroot # In all the other variables, HOST_DIR will be replaced by RELOCATED_HOST_DIR, # so we have to strip "$(HOST_DIR)/" from the paths that contain it. -$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake: +$(HOST_DIR)/share/buildroot/toolchainfile.cmake: @mkdir -p $(@D) sed \ -e 's#@@STAGING_SUBDIR@@#$(call qstrip,$(STAGING_SUBDIR))#' \ @@ -254,5 +254,5 @@ $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake: $(TOPDIR)/support/misc/toolchainfile.cmake.in \ > $@ -$(HOST_DIR)/usr/share/buildroot/Platform/Buildroot.cmake: +$(HOST_DIR)/share/buildroot/Platform/Buildroot.cmake: $(Q)$(INSTALL) -D -m 0644 support/misc/Buildroot.cmake $(@) diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index c38800e598..c8c710bddd 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -4,11 +4,11 @@ # # In order to allow the toolchain to be relocated, we calculate the -# HOST_DIR based on this file's location: $(HOST_DIR)/usr/share/buildroot +# HOST_DIR based on this file's location: $(HOST_DIR)/share/buildroot # and store it in RELOCATED_HOST_DIR. # All the other variables that need to refer to HOST_DIR will use the # RELOCATED_HOST_DIR variable. -string(REPLACE "/usr/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR}) +string(REPLACE "/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR}) # Point cmake to the location where we have our custom modules, # so that it can find our custom platform description. diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index e29837357a..400cfe116b 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -37,5 +37,5 @@ endif $(eval $(virtual-package)) -toolchain: $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake -toolchain: $(HOST_DIR)/usr/share/buildroot/Platform/Buildroot.cmake +toolchain: $(HOST_DIR)/share/buildroot/toolchainfile.cmake +toolchain: $(HOST_DIR)/share/buildroot/Platform/Buildroot.cmake