diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-03-04 03:13:26 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-03-04 03:13:26 (GMT) |
| commit | dedfe6905a7e90933097c345be5cbc743b060622 (patch) | |
| tree | 1e1b040b1b6c7dc02e5ef650e847b0a02a63aff4 /scripts | |
| parent | 0b895560198f61d28af494973bd9ca5181db9970 (diff) | |
| parent | 69f95de8b030bf03f08ffdd54bac8192a23625e5 (diff) | |
Merge pull request #630 from stilor/upgrades
Final batch of updates before 1.23
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/addToolVersion.sh | 3 | ||||
| -rw-r--r-- | scripts/build/libc/mingw.sh | 4 | ||||
| -rw-r--r-- | scripts/functions | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index dbd1243..38c2e55 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 eb04cb6..a2c25ec 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/functions b/scripts/functions index 723064c..969e9bf 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 |