From bc542408ca3c74e977e4f30d77ae6b9a6f388cbe Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 17 Mar 2018 22:19:45 -0700 Subject: [PATCH] config.sub/config.guess must either be executable or be run through shell Signed-off-by: Alexey Neyman --- bootstrap | 7 ++++++- scripts/functions | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/bootstrap b/bootstrap index 5c6eacaa..e4a207bb 100755 --- a/bootstrap +++ b/bootstrap @@ -743,10 +743,15 @@ msg "*** Gathering the list of data files to install" declare -A seen_files echo -n "verbatim_data =" find config contrib packages samples scripts -type f | LANG=C sort | while read f; do + # Implement some kind of .installignore for these files? case "${f}" in # Skip certain files not needed at runtime (used above for generating kconfig # fragments). - packages/*.help|packages/*.desc) + packages/*.help | packages/*.desc) + continue + ;; + # And, some file automake insists we must have + scripts/compile | scripts/missing | scripts/depcomp | scripts/ltmain.sh | scripts/install-sh) continue ;; # Special hack for configure.in.in - replace with the file that configure diff --git a/scripts/functions b/scripts/functions index 9440f0e3..62966fd2 100644 --- a/scripts/functions +++ b/scripts/functions @@ -986,17 +986,17 @@ CT_GetFile() # Those from CT_TOP_DIR, if they exist, will be be more recent than those from CT_LIB_DIR. CT_DoConfigGuess() { if [ -x "${CT_TOP_DIR}/scripts/config.guess" ]; then - "${CT_TOP_DIR}/scripts/config.guess" + "${CT_CONFIG_SHELL}" "${CT_TOP_DIR}/scripts/config.guess" else - "${CT_LIB_DIR}/scripts/config.guess" + "${CT_CONFIG_SHELL}" "${CT_LIB_DIR}/scripts/config.guess" fi } CT_DoConfigSub() { if [ -x "${CT_TOP_DIR}/scripts/config.sub" ]; then - "${CT_TOP_DIR}/scripts/config.sub" "$@" + "${CT_CONFIG_SHELL}" "${CT_TOP_DIR}/scripts/config.sub" "$@" else - "${CT_LIB_DIR}/scripts/config.sub" "$@" + "${CT_CONFIG_SHELL}" "${CT_LIB_DIR}/scripts/config.sub" "$@" fi }