From 1c329c33bf4e1c6767454f98285e91ee19f1f724 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Mon, 29 Jan 2018 22:47:26 -0800
Subject: Ncurses fixes for 6.1

- Update to 20180129
- Throw in --disable-db-install if database is disabled; otherwise
  'make install' tries to run tic which is not built.
- Select appropriate strip utility for the host; otherwise non-x86
  architectures fail to install (unless --disable-stripping is also
  added)

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 scripts/override/install | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'scripts/override/install')

diff --git a/scripts/override/install b/scripts/override/install
index e3954fb6..720866f8 100644
--- a/scripts/override/install
+++ b/scripts/override/install
@@ -1,8 +1,22 @@
 #!@CONFIG_SHELL@
 
+# GNU install takes the program to run to strip a binary via a --strip-program=
+# argument. Fallback script, install-sh, chokes on any unknown option and takes
+# the program name via $STRIPPROG variable - but that variable is ignored by
+# GNU install. BSD install uses $STRIPBIN.
+#
+# If using GNU install, convert to the command line option. In any case, set
+# STRIPPROG and STRIPBIN - they're either supported or harmless.
+if [ -n "${STRIPPROG}" ]; then
+    if [ "@INSTALL_WITH_STRIP_PROGRAM@" = "y" ]; then
+        __strip_opt="--strip-program=${STRIPPROG}"
+    fi
+    export STRIPBIN="${STRIPPROG}"
+fi
+
 # Do the most common case first
 if [ -z "${__PORTAGE_HELPER_PATH}" ]; then
-    exec @TOOL_PATH@ "$@"
+    exec @TOOL_PATH@ ${__strip_opt} "$@"
 fi
 
 # Not so simple case: Gentoo uses *two* wrappers around install script
@@ -32,4 +46,4 @@ for x in ${PATH}; do
     fi
 done
 PATH="${path}"
-exec @TOOL_PATH@ "$@"
+exec @TOOL_PATH@ ${__strip_opt} "$@"
-- 
cgit v1.2.3