diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/addToolVersion.sh | 3 | ||||
| -rw-r--r-- | scripts/build/libc/mingw.sh | 4 | ||||
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 8 | ||||
| -rw-r--r-- | scripts/functions | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index dbd12439..38c2e552 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -18,7 +18,7 @@ doHelp() { 'tool' in one of: gcc, binutils, glibc, uClibc, uClibc-ng, newlib, linux, gdb, duma, strace, ltrace, libelf, gmp, mpfr, isl, cloog, mpc, - mingw-w64, expat, ncurses, musl, gettext, zlib + mingw-w64, expat, ncurses, musl, gettext, zlib, libiconv Valid options for all tools: --stable, -s, +x (default) @@ -210,6 +210,7 @@ while [ $# -gt 0 ]; do --expat) EXP=; OBS=; cat=EXPAT; tool=expat; tool_prefix=companion_libs; dot2suffix=;; --ncurses) EXP=; OBS=; cat=NCURSES; tool=ncurses; tool_prefix=companion_libs; dot2suffix=;; --gettext) EXP=; OBS=; cat=GETTEXT; tool=gettext; tool_prefix=companion_libs; dot2suffix=;; + --libiconv) EXP=; OBS=; cat=LIBICONV; tool=libiconv; tool_prefix=companion_libs; dot2suffix=;; --zlib) EXP=; OBS=; cat=ZLIB; tool=zlib; tool_prefix=companion_tools; dot2suffix=;; --make) EXP=; OBS=; cat=MAKE; tool=make; tool_prefix=companion_tools; dot2suffix=;; --m4) EXP=; OBS=; cat=M4; tool=m4; tool_prefix=companion_tools; dot2suffix=;; diff --git a/scripts/build/libc/mingw.sh b/scripts/build/libc/mingw.sh index eb04cb6b..a2c25ec6 100644 --- a/scripts/build/libc/mingw.sh +++ b/scripts/build/libc/mingw.sh @@ -4,16 +4,14 @@ CT_WINAPI_VERSION_DOWNLOADED= do_libc_get() { - CT_DoStep INFO "Fetching mingw-w64 source for ${CT_WINAPI_VERSION}" if [ "${CT_WINAPI_VERSION}" = "devel" ]; then CT_GetGit "mingw-w64" "ref=HEAD" "git://git.code.sf.net/p/mingw-w64/mingw-w64" CT_WINAPI_VERSION_DOWNLOADED - CT_DoLog EXTRA "Fetched as ${CT_WINAPI_VERSION_DOWNLOADED}" + CT_DoLog DEBUG "Fetched mingw-w64 as ${CT_WINAPI_VERSION_DOWNLOADED}" else CT_GetFile "mingw-w64-v${CT_WINAPI_VERSION}" \ http://downloads.sourceforge.net/sourceforge/mingw-w64 CT_WINAPI_VERSION_DOWNLOADED=v${CT_WINAPI_VERSION} fi - CT_EndStep } do_libc_extract() { diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 81686a56..368f9d24 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -279,6 +279,9 @@ CT_DoExecLog ALL chmod -R u+w "${CT_PREFIX_DIR}" # Setting up the rest of the environment only if not restarting if [ -z "${CT_RESTART}" ]; then + # Having .. inside CT_PREFIX breaks relocatability. + CT_SanitizeVarDir CT_PREFIX_DIR + case "${CT_SYSROOT_NAME}" in "") CT_SYSROOT_NAME="sysroot";; .) CT_Abort "Sysroot name is set to '.' which is forbidden";; @@ -288,11 +291,10 @@ if [ -z "${CT_RESTART}" ]; then # Arrange paths depending on whether we use sysroot or not. if [ "${CT_USE_SYSROOT}" = "y" ]; then - CT_SYSROOT_REL_DIR="${CT_SYSROOT_DIR_PREFIX:+${CT_SYSROOT_DIR_PREFIX}/}${CT_SYSROOT_NAME}" - CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_REL_DIR}" + CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME}" 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_REL_DIR CT_SYSROOT_DIR CT_DEBUGROOT_DIR CT_HEADERS_DIR + 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}" diff --git a/scripts/functions b/scripts/functions index 723064c1..969e9bfb 100644 --- a/scripts/functions +++ b/scripts/functions @@ -1006,10 +1006,10 @@ CT_GetGit() { CT_DoLog WARN "Ambiguous ref ${ref} at ${url}, using first" fi local cset=$(echo "$matches" | head -n1 | cut -c1-6) - CT_DoLog INFO "ref ${ref} at ${url} has cset of ${cset}" + CT_DoLog DEBUG "ref ${ref} at ${url} has cset of ${cset}" else local cset=${cset_or_ref} - CT_DoLog INFO "cset ${cset}" + CT_DoLog DEBUG "cset ${cset}" fi if [ -n "${_out_cset}" ]; then |