diff options
| author |   Alexey Neyman <stilor@att.net> | 2018-04-29 22:04:23 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-04-29 22:04:23 (GMT) |
| commit | 5c24106d3b6ddb5229874a74e3cfe0059fa8ce8d (patch) | |
| tree | 6ae4685ef53ec2b10593fe19fc1397bc8619f311 /scripts | |
| parent | 51f0e7c649a84c66ce0111703498dc4466e35562 (diff) | |
| parent | 74979fb19b2c7220dab4196c0d34e0c29b341b09 (diff) | |
Merge pull request #953 from stilor/docker-testing2
Docker configuration for Gentoo + a bunch of fixes
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/debug/500-strace.sh | 3 | ||||
| -rw-r--r-- | scripts/crosstool-NG.sh | 10 | ||||
| -rw-r--r-- | scripts/override/__default | 3 |
3 files changed, 8 insertions, 8 deletions
diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh index 305a76c..480daaa 100644 --- a/scripts/build/debug/500-strace.sh +++ b/scripts/build/debug/500-strace.sh @@ -37,7 +37,8 @@ do_debug_strace_build() "${CT_SRC_DIR}/strace/configure" \ --build=${CT_BUILD} \ --host=${CT_TARGET} \ - --prefix=/usr + --prefix=/usr \ + --enable-mpers=check CT_DoLog EXTRA "Building strace" CT_DoExecLog ALL make diff --git a/scripts/crosstool-NG.sh b/scripts/crosstool-NG.sh index d4414b5..9bd80ad 100644 --- a/scripts/crosstool-NG.sh +++ b/scripts/crosstool-NG.sh @@ -115,11 +115,13 @@ cat "${paths_sh_location}" |while read trash line; do tool="${line%%=*}" # Suppress extra quoting eval path=${line#*=} - if [ -r "${CT_LIB_DIR}/scripts/override/$tool" ]; then - tmpl="${CT_LIB_DIR}/scripts/override/$tool" - else - tmpl="${CT_LIB_DIR}/scripts/override/__default" + if [ ! -r "${CT_LIB_DIR}/scripts/override/$tool" ]; then + if [ -n "${path}" ]; then + CT_DoExecLog ALL ln -s "${path}" "${CT_TOOLS_OVERRIDE_DIR}/bin/${tool}" + fi + continue fi + tmpl="${CT_LIB_DIR}/scripts/override/$tool" 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 \ diff --git a/scripts/override/__default b/scripts/override/__default deleted file mode 100644 index 977b1f5..0000000 --- a/scripts/override/__default +++ /dev/null @@ -1,3 +0,0 @@ -#!@CONFIG_SHELL@ - -exec @TOOL_PATH@ "$@" |