From 865a095d70c7f3a7b7f657f68da9e3b11cd1be6e Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 3 Mar 2017 16:45:05 -0800 Subject: Do not pretend we're downloading anything ... when we're actually don't. Signed-off-by: Alexey Neyman --- scripts/build/libc/mingw.sh | 4 +--- scripts/functions | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'scripts') 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/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 -- cgit v1.2.3 From 2f24d5cd7509999998f788d28f8fd21e41bb68c1 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 3 Mar 2017 16:50:31 -0800 Subject: Add libiconv 1.15 Signed-off-by: Alexey Neyman --- config/companion_libs/libiconv.in | 5 +++++ scripts/addToolVersion.sh | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/config/companion_libs/libiconv.in b/config/companion_libs/libiconv.in index 361d34e0..d871681c 100644 --- a/config/companion_libs/libiconv.in +++ b/config/companion_libs/libiconv.in @@ -6,6 +6,10 @@ choice # Don't remove next line # CT_INSERT_VERSION_BELOW +config LIBICONV_V_1_15 + bool + prompt "1.15" + config LIBICONV_V_1_14 bool prompt "1.14" @@ -16,4 +20,5 @@ config LIBICONV_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW + default "1.15" if LIBICONV_V_1_15 default "1.14" if LIBICONV_V_1_14 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=;; -- cgit v1.2.3