From d97d16034e22b68ad21706881bdc0d045f0a19db Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Fri, 7 Jul 2017 19:09:46 +0200 Subject: [PATCH] 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 Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/execline/execline.mk | 3 +++ 1 file changed, 3 insertions(+) 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 \ -- 2.30.2