From patchwork Sat Jun 30 20:22:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 168329 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 363522C0079 for ; Sun, 1 Jul 2012 06:23:15 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 90FA4100CAD; Sat, 30 Jun 2012 20:23:13 +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 Qtvqc9Yser4E; Sat, 30 Jun 2012 20:23:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 03237100DE2; Sat, 30 Jun 2012 20:23:08 +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 ACF6F8F753 for ; Sat, 30 Jun 2012 20:23:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9F19C8B653 for ; Sat, 30 Jun 2012 20:23:06 +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 dLtQOJ0w89kB for ; Sat, 30 Jun 2012 20:23:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9B8688B5C4 for ; Sat, 30 Jun 2012 20:23:01 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1Sl4Bv-0003Gr-LL; Sat, 30 Jun 2012 22:22:57 +0200 Received: from arnout by vandecaa-laptop with local (Exim 4.80) (envelope-from ) id 1Sl4Bu-0005Lk-AK; Sat, 30 Jun 2012 22:22:50 +0200 From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@busybox.net Date: Sat, 30 Jun 2012 22:22:47 +0200 Message-Id: <1341087767-20528-1-git-send-email-arnout@mind.be> X-Mailer: git-send-email 1.7.10 Subject: [Buildroot] [PATCH v2] Make external toolchain relocatable 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 The external toolchain wrapper sets sysroot etc. to an absolute path. By changing this to a relative path, it is possible to move the host directory to a different location and still have a working build system. This only works for a downloaded external toolchain. For a pre-installed external toolchain, it is possible to move the host directory to a different location, but not the external toolchain directory (it does work if the external toolchain directory lies within the host directory). For an internal or crosstool-ng toolchain, there is no wrapper so updating the sysroot path should be done in a different way. See http://lists.busybox.net/pipermail/buildroot/2012-February/050371.html for information about others things to do to make the host directory relocatable. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- v2: rebased against current master (dc1d20acb) package/Makefile.in | 4 +- toolchain/toolchain-external/ext-tool.mk | 14 ++++- .../toolchain-external/ext-toolchain-wrapper.c | 64 ++++++++++++++------ 3 files changed, 60 insertions(+), 22 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index c5ad00a..a9609f9 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -56,8 +56,8 @@ TARGET_ABI+=-mabi=spe -mfloat-gprs=double -Wa,-me500mc endif endif -STAGING_DIR=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/sysroot - +STAGING_SUBDIR = usr/$(GNU_TARGET_NAME)/sysroot +STAGING_DIR = $(HOST_DIR)/$(STAGING_SUBDIR) TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION)) ifeq ($(BR2_OPTIMIZE_0),y) diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk index 3f58aad..2a8a978 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -122,9 +122,17 @@ endif TOOLCHAIN_EXTERNAL_CROSS=$(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)- TOOLCHAIN_EXTERNAL_CC=$(TOOLCHAIN_EXTERNAL_CROSS)gcc TOOLCHAIN_EXTERNAL_CXX=$(TOOLCHAIN_EXTERNAL_CROSS)g++ -TOOLCHAIN_EXTERNAL_WRAPPER_ARGS = \ - -DBR_CROSS_PATH='"$(TOOLCHAIN_EXTERNAL_BIN)/"' \ - -DBR_SYSROOT='"$(STAGING_DIR)"' +TOOLCHAIN_EXTERNAL_WRAPPER_ARGS = -DBR_SYSROOT='"$(STAGING_SUBDIR)"' + +ifeq ($(filter $(HOST_DIR)/%,$(TOOLCHAIN_EXTERNAL_BIN)),) +# TOOLCHAIN_EXTERNAL_BIN points outside HOST_DIR => absolute path +TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \ + -DBR_CROSS_PATH_ABS='"$(TOOLCHAIN_EXTERNAL_BIN)"' +else +# TOOLCHAIN_EXTERNAL_BIN points inside HOST_DIR => relative path +TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \ + -DBR_CROSS_PATH_REL='"$(TOOLCHAIN_EXTERNAL_BIN:$(HOST_DIR)/%=%)"' +endif CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE)) CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU)) diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c index 82595ea..a92bada 100644 --- a/toolchain/toolchain-external/ext-toolchain-wrapper.c +++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c @@ -2,9 +2,12 @@ * Buildroot wrapper for external toolchains. This simply executes the real * toolchain with a number of arguments (sysroot/arch/..) hardcoded, * to ensure the external toolchain uses the correct configuration. + * The hardcoded path arguments are defined relative to the actual location + * of the binary. * * (C) 2011 Peter Korsgaard * (C) 2011 Daniel Nyström + * (C) 2012 Arnout Vandecappelle (Essensium/Mind) * * This file is licensed under the terms of the GNU General Public License * version 2. This program is licensed "as is" without any warranty of any @@ -17,11 +20,12 @@ #include #include -static char path[PATH_MAX] = BR_CROSS_PATH; +static char path[PATH_MAX]; +static char sysroot[PATH_MAX]; static char *predef_args[] = { path, - "--sysroot", BR_SYSROOT, + "--sysroot", sysroot, #ifdef BR_ARCH "-march=" BR_ARCH, #endif /* BR_ARCH */ @@ -48,22 +52,50 @@ static char *predef_args[] = { #endif }; -static const char *get_basename(const char *name) -{ - const char *base; - - base = strrchr(name, '/'); - if (base) - base++; - else - base = name; - - return base; -} - int main(int argc, char **argv) { char **args, **cur; + char *relbasedir, *absbasedir; + char *progpath = argv[0]; + char *basename; + int ret; + + /* Calculate the relative paths */ + basename = strrchr(progpath, '/'); + if (basename) { + *basename = '\0'; + basename++; + relbasedir = malloc(strlen(progpath) + 7); + if (relbasedir == NULL) { + perror(__FILE__ ": malloc"); + return 2; + } + sprintf(relbasedir, "%s/../..", argv[0]); + absbasedir = realpath(relbasedir, NULL); + } else { + basename = progpath; + absbasedir = realpath("../..", NULL); + } + if (absbasedir == NULL) { + perror(__FILE__ ": realpath"); + return 2; + } + + /* Fill in the relative paths */ +#ifdef BR_CROSS_PATH_REL + ret = snprintf(path, sizeof(path), "%s/" BR_CROSS_PATH_REL "/%s", absbasedir, basename); +#else /* BR_CROSS_PATH_ABS */ + ret = snprintf(path, sizeof(path), BR_CROSS_PATH_ABS "/%s", basename); +#endif + if (ret >= sizeof(path)) { + perror(__FILE__ ": overflow"); + return 3; + } + ret = snprintf(sysroot, sizeof(sysroot), "%s/" BR_SYSROOT, absbasedir); + if (ret >= sizeof(sysroot)) { + perror(__FILE__ ": overflow"); + return 3; + } cur = args = malloc(sizeof(predef_args) + (sizeof(char *) * argc)); if (args == NULL) { @@ -82,8 +114,6 @@ int main(int argc, char **argv) /* finish with NULL termination */ *cur = NULL; - strcat(path, get_basename(argv[0])); - if (execv(path, args)) perror(path);