summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Le Bihan <eric.le.bihan.dev@free.fr>2017-07-07 19:09:46 +0200
committerPeter Korsgaard <peter@korsgaard.com>2017-07-08 13:44:05 +0200
commitd97d16034e22b68ad21706881bdc0d045f0a19db (patch)
treea15f9d4bd38b74e6a43b8fae4d57d4ca136fd902
parent447feaf9862fae7ba37a88717890784bc48b2ad7 (diff)
downloadbuildroot-d97d16034e22b68ad21706881bdc0d045f0a19db.tar.gz
buildroot-d97d16034e22b68ad21706881bdc0d045f0a19db.zip
execline: restore --shebangdir configure option
Passing the option --shebangdir=/usr/bin to the configuration script adds the CPP definition EXECLINE_SHEBANGPREFIX to execline-x.y.z/src/include/execline/config.h. It is used by `s6-rc-compile` from the s6-rc package to set the path to the execline interpreter in the scripts it generates. So, when building the host variant of execline, this path will be used in the target service scripts generated by the host variant of `s6-rc-compile`. If not forced to /usr/bin, the location of the execline interpreter on the target, it will default to $(HOST_DIR)/bin thus leading to non-working scripts on the target. So, restore this option for the host variant. Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/execline/execline.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/package/execline/execline.mk b/package/execline/execline.mk
index d3d69a85d9..576f11c243 100644
--- a/package/execline/execline.mk
+++ b/package/execline/execline.mk
@@ -44,8 +44,11 @@ endef
HOST_EXECLINE_DEPENDENCIES = host-skalibs
+# Set --shebangdir to /usr/bin, as this value is used by the host variant of
+# s6-rc when generating execline scripts for the target.
HOST_EXECLINE_CONF_OPTS = \
--prefix=$(HOST_DIR) \
+ --shebangdir=/usr/bin \
--with-sysdeps=$(HOST_DIR)/lib/skalibs/sysdeps \
--with-include=$(HOST_DIR)/include \
--with-dynlib=$(HOST_DIR)/lib \
OpenPOWER on IntegriCloud