mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-04-09 04:14:20 +00:00
Save export status for environment vars
... and limit our modifications to our variables. Fixes #762. Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman
parent
2bdb632495
commit
0346153bdb
4
ct-ng.in
4
ct-ng.in
@ -32,10 +32,6 @@ include $(CT_LIB_DIR)/paths.mk
|
||||
# bash.
|
||||
export SHELL=$(bash)
|
||||
|
||||
# GREP_OPTIONS=--color=always will break the generated .in files
|
||||
# We do not need any GREP_OPTIONS anyway, so set it to empty.
|
||||
export GREP_OPTIONS=
|
||||
|
||||
# Make the restart/stop steps available to scripts/crostool-NG.sh
|
||||
export CT_STOP:=$(STOP)
|
||||
export CT_RESTART:=$(RESTART)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
repository='hg https://gmplib.org/repo/gmp/'
|
||||
bootstrap='./.bootstrap'
|
||||
mirrors='https://gmplib.org/download/gmp https:////gmplib.org/download/gmp/archive $(CT_Mirrors GNU gmp)'
|
||||
mirrors='https://gmplib.org/download/gmp https://gmplib.org/download/gmp/archive $(CT_Mirrors GNU gmp)'
|
||||
milestones='5.1'
|
||||
archive_formats='.tar.xz .tar.lz .tar.bz2'
|
||||
|
||||
@ -188,7 +188,7 @@ do_binutils_backend() {
|
||||
--disable-werror \
|
||||
"${extra_config[@]}" \
|
||||
${CT_ARCH_WITH_FLOAT} \
|
||||
${BINUTILS_SYSROOT_ARG} \
|
||||
${CT_BINUTILS_SYSROOT_ARG} \
|
||||
"${CT_BINUTILS_EXTRA_CONFIG_ARRAY[@]}"
|
||||
|
||||
if [ "${static_build}" = "y" ]; then
|
||||
|
||||
@ -560,7 +560,7 @@ do_gcc_core_backend() {
|
||||
--target=${CT_TARGET} \
|
||||
--prefix="${prefix}" \
|
||||
--with-local-prefix="${CT_SYSROOT_DIR}" \
|
||||
${CC_CORE_SYSROOT_ARG} \
|
||||
${CT_CC_CORE_SYSROOT_ARG} \
|
||||
"${extra_config[@]}" \
|
||||
--enable-languages="${lang_list}" \
|
||||
"${extra_user_config[@]}"
|
||||
@ -1105,7 +1105,7 @@ do_gcc_backend() {
|
||||
--host=${host} \
|
||||
--target=${CT_TARGET} \
|
||||
--prefix="${prefix}" \
|
||||
${CC_SYSROOT_ARG} \
|
||||
${CT_CC_SYSROOT_ARG} \
|
||||
"${extra_config[@]}" \
|
||||
--with-local-prefix="${CT_SYSROOT_DIR}" \
|
||||
--enable-long-long \
|
||||
|
||||
@ -40,6 +40,8 @@ if [ "${CT_DEBUG_INTERACTIVE}" = "y" -a ! \( -t 0 -a -t 6 -a -t 2 \) ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
CT_TrapEnvExport
|
||||
|
||||
# Override the locale early, in case we ever translate crosstool-NG messages
|
||||
if [ -z "${CT_NO_OVERRIDE_LC_MESSAGES}" ]; then
|
||||
export LC_ALL=C
|
||||
@ -62,8 +64,8 @@ CT_TestAndAbort "Don't set CFLAGS. It screws up the build." -n "${CFLAGS+set}"
|
||||
CT_TestAndAbort "Don't set CXXFLAGS. It screws up the build." -n "${CXXFLAGS+set}"
|
||||
CT_TestAndAbort "Don't set CC. It screws up the build." -n "${CC+set}"
|
||||
CT_TestAndAbort "Don't set CXX. It screws up the build." -n "${CXX+set}"
|
||||
CT_Test "GREP_OPTIONS screws up the build. Resetting." -n "${GREP_OPTIONS}"
|
||||
export GREP_OPTIONS=
|
||||
CT_Test "GREP_OPTIONS screws up the build. Unsetting." -n "${GREP_OPTIONS+set}"
|
||||
unset GREP_OPTIONS
|
||||
# Workaround against openSUSE 12.1 that breaks ./configure for cross-compilation:
|
||||
export CONFIG_SITE=
|
||||
|
||||
@ -141,9 +143,13 @@ CT_DoStep DEBUG "Dumping user-supplied crosstool-NG configuration"
|
||||
CT_DoExecLog DEBUG ${grep} -E '^(# )?CT_' .config
|
||||
CT_EndStep
|
||||
|
||||
CT_DoLog DEBUG "Unsetting and unexporting MAKEFLAGS"
|
||||
CT_DoLog DEBUG "Unsetting MAKEFLAGS"
|
||||
unset MAKEFLAGS
|
||||
export MAKEFLAGS
|
||||
|
||||
# Set the shell to be used by ./configure scripts and by Makefiles (those
|
||||
# that support it!).
|
||||
export CONFIG_SHELL="${CT_CONFIG_SHELL}" # for ./configure
|
||||
export SHELL="${CT_CONFIG_SHELL}" # for Makefiles
|
||||
|
||||
CT_DoLog INFO "Building environment variables"
|
||||
|
||||
@ -304,9 +310,9 @@ if [ -z "${CT_RESTART}" ]; then
|
||||
CT_DEBUGROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/debug-root"
|
||||
CT_HEADERS_DIR="${CT_SYSROOT_DIR}/usr/include"
|
||||
CT_SanitizeVarDir CT_SYSROOT_DIR CT_DEBUGROOT_DIR CT_HEADERS_DIR
|
||||
BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
|
||||
CC_CORE_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
|
||||
CC_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
|
||||
CT_BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
|
||||
CT_CC_CORE_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
|
||||
CT_CC_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
|
||||
# glibc's prefix must be exactly /usr, else --with-sysroot'd gcc will get
|
||||
# confused when $sysroot/usr/include is not present.
|
||||
# Note: --prefix=/usr is magic!
|
||||
@ -320,11 +326,11 @@ if [ -z "${CT_RESTART}" ]; then
|
||||
# hack! Always use --with-sysroot for binutils.
|
||||
# binutils 2.14 and later obey it, older binutils ignore it.
|
||||
# Lets you build a working 32->64 bit cross gcc
|
||||
BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
|
||||
CT_BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
|
||||
# Use --with-headers, else final gcc will define disable_glibc while
|
||||
# building libgcc, and you'll have no profiling
|
||||
CC_CORE_SYSROOT_ARG="--without-headers"
|
||||
CC_SYSROOT_ARG="--with-headers=${CT_HEADERS_DIR}"
|
||||
CT_CC_CORE_SYSROOT_ARG="--without-headers"
|
||||
CT_CC_SYSROOT_ARG="--with-headers=${CT_HEADERS_DIR}"
|
||||
fi
|
||||
CT_DoExecLog ALL mkdir -p "${CT_SYSROOT_DIR}"
|
||||
CT_DoExecLog ALL mkdir -p "${CT_DEBUGROOT_DIR}"
|
||||
@ -529,11 +535,6 @@ if [ -z "${CT_RESTART}" ]; then
|
||||
CT_DoLog DEBUG "CFLAGS for host compiler: '${CT_CFLAGS_FOR_HOST}'"
|
||||
CT_DoLog DEBUG "LDFLAGS for host compiler: '${CT_LDFLAGS_FOR_HOST}'"
|
||||
|
||||
# Set the shell to be used by ./configure scripts and by Makefiles (those
|
||||
# that support it!).
|
||||
export CONFIG_SHELL="${CT_CONFIG_SHELL}" # for ./configure
|
||||
export SHELL="${CT_CONFIG_SHELL}" # for Makefiles
|
||||
|
||||
# And help make go faster
|
||||
JOBSFLAGS=
|
||||
# Override the configured jobs with what's been given on the command line
|
||||
@ -601,9 +602,7 @@ if [ -z "${CT_RESTART}" ]; then
|
||||
CT_DoLog DEBUG "Other environment:"
|
||||
printenv |${grep} -v -E '^CT_.+=' |CT_DoLog DEBUG
|
||||
CT_EndStep
|
||||
fi
|
||||
|
||||
if [ -z "${CT_RESTART}" ]; then
|
||||
CT_DoStep INFO "Retrieving needed toolchain components' tarballs"
|
||||
do_companion_tools_get
|
||||
do_kernel_get
|
||||
|
||||
@ -974,6 +974,30 @@ CT_DoPause() {
|
||||
return 0
|
||||
}
|
||||
|
||||
# This function sets up trapping export/unset operations so that saving/restoring
|
||||
# the state can restore status of environment exactly.
|
||||
CT_TrapEnvExport()
|
||||
{
|
||||
unset()
|
||||
{
|
||||
eval "builtin unset $*"
|
||||
CT_ENVVAR_UNSET="${CT_ENVVAR_UNSET} $*"
|
||||
}
|
||||
|
||||
export()
|
||||
{
|
||||
local v
|
||||
|
||||
for v in "$@"; do
|
||||
eval "builtin export \"${v}\""
|
||||
case "${CT_ENVVAR_EXPORTED} " in
|
||||
*" ${v%%=*} "*) continue;;
|
||||
esac
|
||||
CT_ENVVAR_EXPORTED="${CT_ENVVAR_EXPORTED} ${v%%=*}"
|
||||
done
|
||||
}
|
||||
}
|
||||
|
||||
# This function creates a tarball of the specified directory, but
|
||||
# only if it exists
|
||||
# Usage: CT_DoTarballIfExists <dir> <tarball_basename> [extra_tar_options [...]]
|
||||
@ -1033,25 +1057,31 @@ CT_DoSaveState() {
|
||||
[ "${CT_DEBUG_CT_SAVE_STEPS}" = "y" ] || return 0
|
||||
local state_name="$1"
|
||||
local state_dir="${CT_STATE_DIR}/${state_name}"
|
||||
local v
|
||||
|
||||
CT_DoLog INFO "Saving state to restart at step '${state_name}'..."
|
||||
|
||||
rm -rf "${state_dir}"
|
||||
mkdir -p "${state_dir}"
|
||||
|
||||
# Save only environment variables, not functions.
|
||||
# Limit saving to our variables (CT_*) and exported variables.
|
||||
# Also unset variables that have been removed from the environment.
|
||||
# This generated script will be sourced from a function, so make
|
||||
# all the definitions global by adding -g. Hope we don't have
|
||||
# a multi-line variable that has a line starting with "declare"
|
||||
# (or we'll need to run sed on each variable separately, only on
|
||||
# the first line of it).
|
||||
CT_DoLog STATE " Saving environment and aliases"
|
||||
# We must omit shell functions, and some specific bash variables
|
||||
# that break when restoring the environment, later. We could do
|
||||
# all the processing in the awk script, but a sed is easier...
|
||||
set |${awk} '
|
||||
BEGIN { _p = 1; }
|
||||
$0~/^[^ ]+ \(\)/ { _p = 0; }
|
||||
_p == 1
|
||||
$0 == "}" { _p = 1; }
|
||||
' |${sed} -r -e '/^BASH_(ARGC|ARGV|LINENO|SOURCE|VERSINFO)=/d;
|
||||
/^(UID|EUID)=/d;
|
||||
/^(FUNCNAME|GROUPS|PPID|SHELLOPTS)=/d;' >"${state_dir}/env.sh"
|
||||
|
||||
{
|
||||
for v in "${!CT_@}" ${CT_ENVVAR_EXPORTED}; do
|
||||
# Check if it is still set
|
||||
[ -n "${!v+set}" ] && declare -p "${v}"
|
||||
done | ${sed} 's/^declare /declare -g /'
|
||||
echo "builtin unset ${CT_ENVVAR_UNSET}"
|
||||
} >"${state_dir}/env.sh"
|
||||
|
||||
# Save .config to check it hasn't changed when resuming.
|
||||
CT_DoExecLog STATE cp ".config" "${state_dir}/config"
|
||||
|
||||
CT_DoTarballIfExists "${CT_BUILDTOOLS_PREFIX_DIR}" "${state_dir}/buildtools_dir"
|
||||
@ -1094,7 +1124,6 @@ CT_DoLoadState(){
|
||||
# Restore the new RESTART and STOP steps
|
||||
CT_RESTART="${old_RESTART}"
|
||||
CT_STOP="${old_STOP}"
|
||||
unset old_stop old_restart
|
||||
|
||||
CT_DoLog STATE " Restoring log file"
|
||||
CT_LogDisable
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user