From patchwork Tue Feb 4 17:55:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uwe Strempel X-Patchwork-Id: 316696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 9D3342C0097 for ; Wed, 5 Feb 2014 04:56:25 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E19078C07C; Tue, 4 Feb 2014 17:56:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Is-ar3HOD2Rn; Tue, 4 Feb 2014 17:56:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8A8F38BF41; Tue, 4 Feb 2014 17:56:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1A2861C2441 for ; Tue, 4 Feb 2014 17:56:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 136AE8BF1F for ; Tue, 4 Feb 2014 17:56:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZM7d0TpE+-S1 for ; Tue, 4 Feb 2014 17:56:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ee0-f44.google.com (mail-ee0-f44.google.com [74.125.83.44]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1970C8BF41 for ; Tue, 4 Feb 2014 17:56:20 +0000 (UTC) Received: by mail-ee0-f44.google.com with SMTP id c13so4449444eek.31 for ; Tue, 04 Feb 2014 09:56:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=DPGokXtSdFFM03ESW6grYCps9+ZjCaWpaA8I0mchUdQ=; b=k0/DKkB/YQ5izubtUN9erm/4UFHVXAr6wfMnDpTiLKCEU5yB4yr9PnX0aH8erAMg5v T10R8AdCdU6rrLPX+sQ/dk3aMuX75vt1PbUSQ5lpgvpOzyPnRwUFHhAqDFXpyFMcliHv EqfewUkrY6J0Da8rsjP+si00IHxNOxBcCRYfUdiCyOAaCIKkggzIUp0lQynpey3d3Fdk OrLoECLbpO+kr2hufOCbuYtdQWrAwnwvfA4YNZNGE4imvXszIGTihiFcW80g7tA7Pnri qH97khGarcCWAjS5Uv2GZ/D3ekKuU/rEPadTTq7fbKJwztpi83YD7MrH2grWFe7cWPE+ Vyvw== X-Received: by 10.15.76.69 with SMTP id m45mr4281130eey.96.1391536579432; Tue, 04 Feb 2014 09:56:19 -0800 (PST) Received: from localhost.localdomain (p5B02DF1C.dip0.t-ipconnect.de. [91.2.223.28]) by mx.google.com with ESMTPSA id x2sm91386196eeo.8.2014.02.04.09.56.03 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 04 Feb 2014 09:56:03 -0800 (PST) From: Uwe Strempel To: buildroot@busybox.net Date: Tue, 4 Feb 2014 18:55:51 +0100 Message-Id: <1391536551-57608-1-git-send-email-u.strempel@googlemail.com> X-Mailer: git-send-email 1.8.3.4 (Apple Git-47) Subject: [Buildroot] [PATCH 1/1] Added patch fixing absolute path in toolchainfile.cmake X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net On build process of buildroot the toolchainfile.cmake is created, but with wrong absolut path. When shareing the toolchain or move the folder you get problems this path settings. A workarround for cmake files is - get the path of the toolchainfile.cmake and set the the variables. see BUG #6818 Signed-off-by: Uwe Strempel --- package/Makefile.in | 5 +++++ package/pkg-cmake.mk | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index 2e433fd..aa86fca 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -140,8 +140,10 @@ endif ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) TARGET_CROSS=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)- +TARGET_CROSS_WITHOUT_HOST_DIR=/usr/bin/$(GNU_TARGET_NAME)- else TARGET_CROSS=$(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))- +TARGET_CROSS_WITHOUT_HOST_DIR=/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))- endif # Quotes are needed for spaces et al in path components. @@ -164,6 +166,9 @@ TARGET_OBJDUMP = $(TARGET_CROSS)objdump TARGET_CC_NOCCACHE := $(TARGET_CC) TARGET_CXX_NOCCACHE := $(TARGET_CXX) +TARGET_CC_NOCCACHE_WITHOUT_HOST_DIR := $(TARGET_CROSS_WITHOUT_HOST_DIR)gcc +TARGET_CXX_NOCCACHE_WITHOUT_HOST_DIR := $(TARGET_CROSS_WITHOUT_HOST_DIR)g++ + ifeq ($(BR2_CCACHE),y) TARGET_CC := $(CCACHE) $(TARGET_CC) TARGET_CXX := $(CCACHE) $(TARGET_CXX) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 13be557..3f5389f 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -160,16 +160,17 @@ host-cmake-package = $(call inner-cmake-package,host-$(call pkgname),$(call UPPE $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake: @mkdir -p $(@D) @echo -en "\ + get_filename_component(CMAKE_TOOLCHAIN_PATH \$${CMAKE_CURRENT_LIST_FILE} PATH)\n\ set(CMAKE_SYSTEM_NAME Linux)\n\ - set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\ - set(CMAKE_CXX_COMPILER $(TARGET_CXX_NOCCACHE))\n\ + set(CMAKE_C_COMPILER \"\$${CMAKE_TOOLCHAIN_PATH}/$(TARGET_CC_NOCCACHE_WITHOUT_HOST_DIR)\")\n\ + set(CMAKE_CXX_COMPILER \"\$${CMAKE_TOOLCHAIN_PATH}/$(TARGET_CXX_NOCCACHE_WITHOUT_HOST_DIR)\")\n\ set(CMAKE_C_FLAGS \"\$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)\" CACHE STRING \"Buildroot CFLAGS\" FORCE)\n\ set(CMAKE_CXX_FLAGS \"\$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)\" CACHE STRING \"Buildroot CXXFLAGS\" FORCE)\n\ set(CMAKE_INSTALL_SO_NO_EXE 0)\n\ - set(CMAKE_PROGRAM_PATH \"$(HOST_DIR)/usr/bin\")\n\ - set(CMAKE_FIND_ROOT_PATH \"$(STAGING_DIR)\")\n\ + set(CMAKE_PROGRAM_PATH \"\$${CMAKE_TOOLCHAIN_PATH}/usr/bin\")\n\ + set(CMAKE_FIND_ROOT_PATH \"\$${CMAKE_TOOLCHAIN_PATH}/${STAGING_SUBDIR}\")\n\ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)\n\ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)\n\ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)\n\ - set(ENV{PKG_CONFIG_SYSROOT_DIR} \"$(STAGING_DIR)\")\n\ + set(ENV{PKG_CONFIG_SYSROOT_DIR} \"\$${CMAKE_TOOLCHAIN_PATH}/${STAGING_SUBDIR}\")\n\ " > $@