toolchain-external-custom: allow specifying relative path to binaries

PATCH Superseded Calin Crisan 2 participants 3 messages Mar 24, 2018 – Mar 25, 2018

Share & tools

Calin Crisan

author

2018-03-24 15:11 UTC #0 lore raw

PATCH v2 1/1 toolchain-external-custom: allow specifying relative path to binaries

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 <[email protected]>

---
 toolchain/toolchain-external/pkg-toolchain-external.mk            | 8 +++++++-
 .../toolchain-external-custom/Config.in.options                   | 8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

toolchain/toolchain-external/pkg-toolchain-external.mk +7 -1

index 3bf9fac412..e0a34e1ca9 100644
@@ -71,13 +71,19 @@ else
 TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
 endif
 
+TOOLCHAIN_EXTERNAL_REL_BIN_PATH = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH))
+# if binary path unset (non-custom external toolchains), use "bin"
+ifeq ($(TOOLCHAIN_EXTERNAL_REL_BIN_PATH),)
+TOOLCHAIN_EXTERNAL_REL_BIN_PATH = bin
+endif
+
 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

toolchain/toolchain-external/toolchain-external-custom/Config.in.options +8 -0

index 70c7d8e3c3..b711d9b81f 100644
@@ -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"

Signature · 1 line

2.16.2

Yann E. MORIN

2018-03-25 09:01 UTC #1 lore raw

PATCH v2 1/1 toolchain-external-custom: allow specifying relative path to binaries

Calin, All,

On 2018-03-24 17:11 +0200, Calin Crisan spake thusly:

Quoted 22 lines

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 <[email protected]>
---
 toolchain/toolchain-external/pkg-toolchain-external.mk            | 8 +++++++-
 .../toolchain-external-custom/Config.in.options                   | 8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
toolchain/toolchain-external/pkg-toolchain-external.mk +0 -0
index 3bf9fac412..e0a34e1ca9 100644

toolchain/toolchain-external/pkg-toolchain-external.mk else · line 75

Quoted 5 lines

toolchain/toolchain-external/pkg-toolchain-external.mk +2 -0

@@ -71,13 +71,19 @@ else
 TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
 endif
 
+TOOLCHAIN_EXTERNAL_REL_BIN_PATH = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH))
+# if binary path unset (non-custom external toolchains), use "bin"

Nit: uppercase at beginning of sentence:
# If binary path....

toolchain/toolchain-external/pkg-toolchain-external.mk else · line 78

Quoted 3 lines

toolchain/toolchain-external/pkg-toolchain-external.mk +3 -0
+ifeq ($(TOOLCHAIN_EXTERNAL_REL_BIN_PATH),)
+TOOLCHAIN_EXTERNAL_REL_BIN_PATH = bin
+endif

This can be achieved without the if-block:

TOOLCHAIN_EXTERNAL_REL_BIN_PATH = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH)) # If binary path unset (non-custom external toolchains), use "bin" TOOLCHAIN_EXTERNAL_REL_BIN_PATH ?= bin

This can even be achieved with a single assignment, too:

    # If binary path unset (non-custom external toolchains), use "bin"
    TOOLCHAIN_EXTERNAL_REL_BIN_PATH = $(or \
        $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH)), \
        bin)

I prefer that last solution (even if it's the same number os lines)...

Regards,
Yann E. MORIN.

Quoted 37 lines

toolchain/toolchain-external/pkg-toolchain-external.mk +1 -1

 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

toolchain/toolchain-external/toolchain-external-custom/Config.in.options +8 -0

index 70c7d8e3c3..b711d9b81f 100644
@@ -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"

Signature · 6 lines

2.16.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

Calin Crisan

author

2018-03-25 10:21 UTC #2 lore raw

PATCH v2 1/1 toolchain-external-custom: allow specifying relative path to binaries

Yann,

Thanks for reviewing my patch. I have now submitted a v3 that addresses your remarks.

Quoted 117 lines · Yann E. MORIN

Calin, All,
On 2018-03-24 17:11 +0200, Calin Crisan spake thusly:
Quoted 8 lines
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".
Quoted 6 lines
This commit introduces BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH that defaults to "bin" and can be changed as needed.
Signed-off-by Calin Crisan <[email protected]>
---
 toolchain/toolchain-external/pkg-toolchain-external.mk            | 8
+++++++-
Quoted 1 line
 .../toolchain-external-custom/Config.in.options                   | 8
++++++++
Review
Quoted 3 lines
 2 files changed, 15 insertions(+), 1 deletion(-)
(quoted diff) +0 -0
b/toolchain/toolchain-external/pkg-toolchain-external.mk
toolchain/toolchain-external/pkg-toolchain-external.mk else · line 71
Quoted 5 lines
index 3bf9fac412..e0a34e1ca9 100644
toolchain/toolchain-external/pkg-toolchain-external.mk +0 -0
@@ -71,13 +71,19 @@ else
 TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_
EXTERNAL_PATH))
toolchain/toolchain-external/pkg-toolchain-external.mk else · line 74
Quoted 3 lines
toolchain/toolchain-external/pkg-toolchain-external.mk +1 -0
 endif
 
+TOOLCHAIN_EXTERNAL_REL_BIN_PATH = $(call qstrip,$(BR2_TOOLCHAIN_
EXTERNAL_REL_BIN_PATH))
toolchain/toolchain-external/pkg-toolchain-external.mk else · line 75
Quoted 1 line
toolchain/toolchain-external/pkg-toolchain-external.mk +1 -0
+# if binary path unset (non-custom external toolchains), use "bin"
Nit: uppercase at beginning of sentence:
# If binary path....
toolchain/toolchain-external/pkg-toolchain-external.mk else · line 78
Quoted 3 lines
toolchain/toolchain-external/pkg-toolchain-external.mk +3 -0
+ifeq ($(TOOLCHAIN_EXTERNAL_REL_BIN_PATH),)
+TOOLCHAIN_EXTERNAL_REL_BIN_PATH = bin
+endif
This can be achieved without the if-block:
    TOOLCHAIN_EXTERNAL_REL_BIN_PATH = $(call qstrip,$(BR2_TOOLCHAIN_
EXTERNAL_REL_BIN_PATH))
# If binary path unset (non-custom external toolchains), use "bin" TOOLCHAIN_EXTERNAL_REL_BIN_PATH ?= bin
This can even be achieved with a single assignment, too:
    # If binary path unset (non-custom external toolchains), use "bin"
    TOOLCHAIN_EXTERNAL_REL_BIN_PATH = $(or \
        $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH)), \
        bin)
I prefer that last solution (even if it's the same number os lines)...
Regards,
Yann E. MORIN.
toolchain/toolchain-external/pkg-toolchain-external.mk else
Quoted 4 lines
toolchain/toolchain-external/pkg-toolchain-external.mk +0 -0
 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))
toolchain/toolchain-external/pkg-toolchain-external.mk else
Quoted 4 lines
toolchain/toolchain-external/pkg-toolchain-external.mk +1 -1
 endif
 else
-TOOLCHAIN_EXTERNAL_BIN = $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin
+TOOLCHAIN_EXTERNAL_BIN = $(TOOLCHAIN_EXTERNAL_INSTALL_
DIR)/$(TOOLCHAIN_EXTERNAL_REL_BIN_PATH)
toolchain/toolchain-external/pkg-toolchain-external.mk else · line 88
Quoted 3 lines
toolchain/toolchain-external/pkg-toolchain-external.mk +0 -0
 endif
 
 # If this is a buildroot toolchain, it already has a wrapper which we
want to
Review
Quoted 1 line
(quoted diff) +0 -0
b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
Quoted 2 lines
index 70c7d8e3c3..b711d9b81f 100644
--- a/toolchain/toolchain-external/toolchain-external-
custom/Config.in.options
Quoted 1 line
+++ b/toolchain/toolchain-external/toolchain-external-
custom/Config.in.options
Quoted 18 lines
toolchain/toolchain-external/pkg-toolchain-external.mk +8 -1
@@ -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
Quoted 4 lines
_______________________________________________
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.  |

Quoted 3 lines

'------------------------------^-------^------------------^- -------------------'

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180325/d377d3c5/attachment.html>