* [Buildroot] [PATCH v3 1/1] toolchain-external-custom: allow specifying relative path to binaries
@ 2018-03-25 10:18 Calin Crisan
2018-03-25 10:40 ` Yann E. MORIN
2018-04-19 21:09 ` Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Calin Crisan @ 2018-03-25 10:18 UTC (permalink / raw)
To: buildroot
There are cases where a downloaded toolchain doesn't have its binaries
placed directly in a "bin" subfolder (where BuildRoot currently looks
for them).
A common example is the official Raspberry Pi Toolchain
(https://github.com/raspberrypi/tools), which has its binaries in
"arm-bcm2708/arm-linux-gnueabihf/bin".
This commit introduces BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH that defaults
to "bin" and can be changed as needed.
Signed-off-by: Calin Crisan <ccrisan@gmail.com>
---
toolchain/toolchain-external/pkg-toolchain-external.mk | 7 ++++++-
.../toolchain-external-custom/Config.in.options | 8 ++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk
index 3bf9fac412..405f2e1698 100644
--- a/toolchain/toolchain-external/pkg-toolchain-external.mk
+++ b/toolchain/toolchain-external/pkg-toolchain-external.mk
@@ -71,13 +71,18 @@ else
TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
endif
+# If binary path unset (known, supported external toolchains), use "bin".
+TOOLCHAIN_EXTERNAL_REL_BIN_PATH = $(or \
+ $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH)), \
+ bin)
+
ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),)
# if no path set, figure it out from path
TOOLCHAIN_EXTERNAL_BIN := $(dir $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
endif
else
-TOOLCHAIN_EXTERNAL_BIN = $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin
+TOOLCHAIN_EXTERNAL_BIN = $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/$(TOOLCHAIN_EXTERNAL_REL_BIN_PATH)
endif
# If this is a buildroot toolchain, it already has a wrapper which we want to
diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index 70c7d8e3c3..b711d9b81f 100644
--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
@@ -12,6 +12,14 @@ config BR2_TOOLCHAIN_EXTERNAL_URL
help
URL of the custom toolchain tarball to download and install.
+config BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH
+ string "Toolchain relative bin path"
+ default "bin"
+ depends on BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD
+ help
+ Path to where the binaries (e.g. the compiler) can be found,
+ relative to the downloaded toolchain root directory.
+
config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
string "Toolchain prefix"
default "$(ARCH)-linux"
--
2.16.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v3 1/1] toolchain-external-custom: allow specifying relative path to binaries
2018-03-25 10:18 [Buildroot] [PATCH v3 1/1] toolchain-external-custom: allow specifying relative path to binaries Calin Crisan
@ 2018-03-25 10:40 ` Yann E. MORIN
2018-04-19 21:09 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2018-03-25 10:40 UTC (permalink / raw)
To: buildroot
Calin, All,
On 2018-03-25 13:18 +0300, Calin Crisan spake thusly:
> There are cases where a downloaded toolchain doesn't have its binaries
> placed directly in a "bin" subfolder (where BuildRoot currently looks
> for them).
>
> A common example is the official Raspberry Pi Toolchain
> (https://github.com/raspberrypi/tools), which has its binaries in
> "arm-bcm2708/arm-linux-gnueabihf/bin".
>
> This commit introduces BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH that defaults
> to "bin" and can be changed as needed.
>
> Signed-off-by: Calin Crisan <ccrisan@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> toolchain/toolchain-external/pkg-toolchain-external.mk | 7 ++++++-
> .../toolchain-external-custom/Config.in.options | 8 ++++++++
> 2 files changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk
> index 3bf9fac412..405f2e1698 100644
> --- a/toolchain/toolchain-external/pkg-toolchain-external.mk
> +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk
> @@ -71,13 +71,18 @@ else
> TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
> endif
>
> +# If binary path unset (known, supported external toolchains), use "bin".
> +TOOLCHAIN_EXTERNAL_REL_BIN_PATH = $(or \
> + $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH)), \
> + bin)
> +
> ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
> ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),)
> # if no path set, figure it out from path
> TOOLCHAIN_EXTERNAL_BIN := $(dir $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
> endif
> else
> -TOOLCHAIN_EXTERNAL_BIN = $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin
> +TOOLCHAIN_EXTERNAL_BIN = $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/$(TOOLCHAIN_EXTERNAL_REL_BIN_PATH)
> endif
>
> # If this is a buildroot toolchain, it already has a wrapper which we want to
> diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
> index 70c7d8e3c3..b711d9b81f 100644
> --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
> +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
> @@ -12,6 +12,14 @@ config BR2_TOOLCHAIN_EXTERNAL_URL
> help
> URL of the custom toolchain tarball to download and install.
>
> +config BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH
> + string "Toolchain relative bin path"
> + default "bin"
> + depends on BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD
> + help
> + Path to where the binaries (e.g. the compiler) can be found,
> + relative to the downloaded toolchain root directory.
> +
> config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
> string "Toolchain prefix"
> default "$(ARCH)-linux"
> --
> 2.16.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v3 1/1] toolchain-external-custom: allow specifying relative path to binaries
2018-03-25 10:18 [Buildroot] [PATCH v3 1/1] toolchain-external-custom: allow specifying relative path to binaries Calin Crisan
2018-03-25 10:40 ` Yann E. MORIN
@ 2018-04-19 21:09 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2018-04-19 21:09 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 25 Mar 2018 13:18:55 +0300, Calin Crisan wrote:
> +# If binary path unset (known, supported external toolchains), use "bin".
> +TOOLCHAIN_EXTERNAL_REL_BIN_PATH = $(or \
> + $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH)), \
> + bin)
I found this syntax a bit ugly, so I changed this to:
+TOOLCHAIN_EXTERNAL_REL_BIN_PATH = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH))
+ifeq ($(TOOLCHAIN_EXTERNAL_REL_BIN_PATH),)
+TOOLCHAIN_EXTERNAL_REL_BIN_PATH = bin
+endif
and also I moved this into...
> +
> ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
> ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),)
> # if no path set, figure it out from path
> TOOLCHAIN_EXTERNAL_BIN := $(dir $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
> endif
> else
... this condition
> -TOOLCHAIN_EXTERNAL_BIN = $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin
> +TOOLCHAIN_EXTERNAL_BIN = $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/$(TOOLCHAIN_EXTERNAL_REL_BIN_PATH)
> endif
Applied with this change.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-19 21:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-25 10:18 [Buildroot] [PATCH v3 1/1] toolchain-external-custom: allow specifying relative path to binaries Calin Crisan
2018-03-25 10:40 ` Yann E. MORIN
2018-04-19 21:09 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox