summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/companion_libs/libiconv.in5
-rwxr-xr-xscripts/addToolVersion.sh3
2 files changed, 7 insertions, 1 deletions
diff --git a/config/companion_libs/libiconv.in b/config/companion_libs/libiconv.in
index 361d34e..d871681 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 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=;;