diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/companion_libs/220-ncurses.sh | 9 | ||||
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 1 | ||||
| -rw-r--r-- | scripts/override/install | 18 |
3 files changed, 24 insertions, 4 deletions
diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh index a32df42..97fb834 100644 --- a/scripts/build/companion_libs/220-ncurses.sh +++ b/scripts/build/companion_libs/220-ncurses.sh @@ -52,7 +52,8 @@ do_ncurses_for_host() { "--without-cxx-binding" \ "--without-ada" ) if [ "${CT_NCURSES_HOST_DISABLE_DB}" = "y" ]; then - opts+=( "--disable-database" ) + opts+=( "--disable-database" \ + "--disable-db-install" ) fi if [ -n "${CT_NCURSES_HOST_FALLBACKS}" ]; then opts+=( "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" ) @@ -174,8 +175,12 @@ do_ncurses_backend() { # install.progs) do not do well with parallel make (-jX). CT_DoLog EXTRA "Building ncurses" CT_DoExecLog ALL make ${JOBSFLAGS} + + # STRIPPROG is handled by our wrapper around install. CT_DoLog EXTRA "Installing ncurses" - CT_DoExecLog ALL make "${install_target}" + CT_DoExecLog ALL \ + STRIPPROG="${host}-strip" \ + make "${install_target}" } fi diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index cc216f9..878681a 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -123,6 +123,7 @@ cat "${CT_LIB_DIR}/paths.sh" |while read trash line; do CT_DoLog DEBUG "Creating script-override for '${tool}' -> '${path}' using '${tmpl}' template" CT_DoExecLog ALL cp "${tmpl}" "${CT_TOOLS_OVERRIDE_DIR}/bin/${tool}" CT_DoExecLog ALL ${sed} -i -r \ + -e "s#@INSTALL_WITH_STRIP_PROGRAM@#${CT_CONFIGURE_has_install_with_strip_program}#g" \ -e "s#@CONFIG_SHELL@#${CT_CONFIG_SHELL}#g" \ -e "s#@TOOL_PATH@#${path}#g" \ -e "s#@TOOLS_OVERRIDE_DIR@#${CT_TOOLS_OVERRIDE_DIR}#g" \ diff --git a/scripts/override/install b/scripts/override/install index e3954fb..720866f 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} "$@" |