aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2017-11-04 09:47:07 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2017-11-26 21:30:33 +0100
commit5a7ffef2398788ad0714a4eadf81b1f41c38ffa4 (patch)
tree2efc910e0e95c31a5a695bc254cc4e204b3a3e73
parentdd2c5e9150bd0469c048f2c4a6087711e9b82d6d (diff)
downloadbuildroot-5a7ffef2398788ad0714a4eadf81b1f41c38ffa4.tar.gz
buildroot-5a7ffef2398788ad0714a4eadf81b1f41c38ffa4.tar.bz2
usb_modeswitch: explicitly set --host / --build for the embedded jimtcl
Fixes: http://autobuild.buildroot.net/results/106/106af20196089e74c35daabdae46f030981600bd/ Otherwise the (handwritten) configure script uses a config.guess script from 2010 to figure out the build host, breaking builds on ppc64le hosts. The result of --host / --build is only used to detect if we are building for Windows or not, which is why things are working on x86(-64) build hosts without specifying --host even though we are cross compiling - But this may change in the future, so we better pass the correct values. Passing extra jimtcl configure flags is unfortunately not forseen in the usb_modeswitch Makefile, so add a small patch making this possible. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit 29cccab4476bc58b2acb50887a67e310045efb24) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/usb_modeswitch/0001-Makefile-allow-extra-configure-flags-to-be-passed-to.patch29
-rw-r--r--package/usb_modeswitch/usb_modeswitch.mk1
2 files changed, 30 insertions, 0 deletions
diff --git a/package/usb_modeswitch/0001-Makefile-allow-extra-configure-flags-to-be-passed-to.patch b/package/usb_modeswitch/0001-Makefile-allow-extra-configure-flags-to-be-passed-to.patch
new file mode 100644
index 0000000000..9e1e681fa5
--- /dev/null
+++ b/package/usb_modeswitch/0001-Makefile-allow-extra-configure-flags-to-be-passed-to.patch
@@ -0,0 +1,29 @@
+From 1309df373c882f27f476130b06746a6d1e1a0f85 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <peter@korsgaard.com>
+Date: Fri, 3 Nov 2017 23:21:44 +0100
+Subject: [PATCH] Makefile: allow extra configure flags to be passed to jimtcl
+ on the make command line
+
+E.G. to pass --host / --build for cross compilation.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index a151e2a..94dabd9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,7 @@ TCL ?= $(HOST_TCL)
+ else
+ TCL ?= /usr/bin/tclsh
+ endif
+-JIM_CONFIGURE_OPTS = --disable-lineedit \
++override JIM_CONFIGURE_OPTS += --disable-lineedit \
+ --with-out-jim-ext="stdlib posix load signal syslog" --prefix=/usr
+
+ .PHONY: clean install install-common uninstall \
+--
+2.11.0
+
diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk
index 1901767f89..ea08de256b 100644
--- a/package/usb_modeswitch/usb_modeswitch.mk
+++ b/package/usb_modeswitch/usb_modeswitch.mk
@@ -23,6 +23,7 @@ endif
define USB_MODESWITCH_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -Wall -I." \
+ JIM_CONFIGURE_OPTS="--host=$(GNU_TARGET_NAME) --build=$(GNU_HOST_NAME)" \
-C $(@D) $(USB_MODESWITCH_BUILD_TARGETS)
endef