From baaee5910a03bba35f486258c4f2e37ee84a63c8 Mon Sep 17 00:00:00 2001 From: JPeterMugaas Date: Tue, 1 May 2018 21:43:59 -0400 Subject: [PATCH] libiconv - Update to libicon 1.15 - latest version --- libiconv/PKGBUILD | 49 ++- libiconv/libiconv-1.14-reloc.patch | 199 +-------- libiconv/libiconv-1.14-wchar.patch | 35 +- libiconv/msys2-libiconv-1.14.patch | 631 ++++++++++++++--------------- 4 files changed, 375 insertions(+), 539 deletions(-) diff --git a/libiconv/PKGBUILD b/libiconv/PKGBUILD index ac898e82..53a5fb14 100644 --- a/libiconv/PKGBUILD +++ b/libiconv/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Alexey Pavlov pkgname=('libiconv' 'libiconv-devel') -pkgver=1.14 -pkgrel=2 +pkgver=1.15 +pkgrel=1 pkgdesc='Libiconv is a conversion library' groups=('libraries') arch=('i686' 'x86_64') @@ -13,20 +13,49 @@ source=("https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz" libiconv-1.14-reloc.patch libiconv-1.14-wchar.patch msys2-libiconv-1.14.patch) -sha256sums=('72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613' +sha256sums=('ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178' '0891f33528131003939c5e7fa610384834d580e80396f411de0b9f26ec1c520f' - 'ed5d4365512781b9b23473cc375a4a2c1491eae31b13b76cda2d55751bff5cdf' - 'd2a57c55683361e49e30ed0de10942e7fe4f4392dc47fe8a24c7b67b21ce9dd7' - '2ec4b97974e60681d843fbd766e18df6df2a7c90a3ff8ccb709ad65edd649689') + 'f9186f805dbb136cc24ce389ecee5a4d4867eec722292bd77893524dcdedf190' + '0c8f78f688c2f116a6441ba0dc9c4308d2d4845114b574dd8f0cd1165f070132' + '849971a5b753222e672faf0d2b7c852e5e29ef07db12acd1d74f272ccc049d27') options=(!libtool) +# Helper macros to help make tasks easier # +apply_patch_with_msg_p2() { + for _patch in "$@" + do + msg2 "Applying $_patch" + patch -Nbp2 -i "${srcdir}/$_patch" + done +} + +apply_patch_with_msg() { + for _patch in "$@" + do + msg2 "Applying $_patch" + patch -Nbp1 -i "${srcdir}/$_patch" + done +} + +del_file_exists() { + for _fname in "$@" + do + if [ -f $_fname ]; then + rm -rf $_fname + fi + done +} +# =========================================== # + + prepare() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p2 -i ${srcdir}/1.14-cross-install.patch - patch -p2 -i ${srcdir}/libiconv-1.14-reloc.patch - patch -p2 -i ${srcdir}/libiconv-1.14-wchar.patch - patch -p1 -i ${srcdir}/msys2-libiconv-1.14.patch + apply_patch_with_msg_p2 1.14-cross-install.patch \ + libiconv-1.14-reloc.patch \ + libiconv-1.14-wchar.patch + apply_patch_with_msg \ + msys2-libiconv-1.14.patch #./autogen.sh --skip-gnulib } diff --git a/libiconv/libiconv-1.14-reloc.patch b/libiconv/libiconv-1.14-reloc.patch index e1a1622d..d46e4d70 100644 --- a/libiconv/libiconv-1.14-reloc.patch +++ b/libiconv/libiconv-1.14-reloc.patch @@ -1,7 +1,7 @@ ---- old/libiconv-1.14/lib/relocatable.c 2011-08-07 13:48:03.000000000 -0400 -+++ new/libiconv-1.14/lib/relocatable.c 2011-10-15 03:14:13.195133600 -0400 -@@ -2,20 +2,18 @@ - Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc. +--- old/libiconv-1.15/lib/relocatable.c.orig 2016-12-02 09:45:20.000000000 -0500 ++++ new/libiconv-1.15/lib/relocatable.c 2018-05-01 02:44:29.048431800 -0400 +@@ -2,10 +2,10 @@ + Copyright (C) 2003-2006, 2008-2012 Free Software Foundation, Inc. Written by Bruno Haible , 2003. - This program is free software; you can redistribute it and/or modify it @@ -15,24 +15,15 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - - /* Tell glibc's to provide a prototype for getline(). -@@ -87,6 +85,19 @@ - # define FILE_SYSTEM_PREFIX_LEN(P) 0 - #endif - +@@ -101,6 +101,19 @@ + #ifndef ENABLE_COSTLY_RELOCATABLE + # if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + # define ENABLE_COSTLY_RELOCATABLE 1 ++# else ++# define ENABLE_COSTLY_RELOCATABLE 0 ++# endif ++#endif ++ +/* Whether to enable the more costly support for relocatable libraries. + It allows libraries to be have been installed with a different original + prefix than the program. But it is quite costly, especially on Cygwin @@ -41,83 +32,11 @@ +#ifndef ENABLE_COSTLY_RELOCATABLE +# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +# define ENABLE_COSTLY_RELOCATABLE 1 -+# else -+# define ENABLE_COSTLY_RELOCATABLE 0 -+# endif -+#endif -+ - /* Original installation prefix. */ - static char *orig_prefix; - static size_t orig_prefix_len; -@@ -156,7 +167,7 @@ - #endif - } - --#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) -+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) - - /* Convenience function: - Computes the current installation prefix, based on the original -@@ -286,7 +297,7 @@ - - #endif /* !IN_LIBRARY || PIC */ - --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - - /* Full pathname of shared library, or NULL. */ - static char *shared_library_fullname; -@@ -332,7 +343,9 @@ - #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ - /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() - function. -- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ -+ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. -+ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on -+ Cygwin 1.7. */ - FILE *fp; - - /* Open the current process' maps file. It describes one VMA per line. */ -@@ -405,7 +418,7 @@ - const char * - relocate (const char *pathname) - { --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - static int initialized; - - /* Initialization code for a shared library. */ + # else + # define ENABLE_COSTLY_RELOCATABLE 0 + # endif --- old/libiconv-1.14/libcharset/lib/relocatable.c 2011-08-07 13:48:03.000000000 -0400 +++ new/libiconv-1.14/libcharset/lib/relocatable.c 2011-10-15 03:14:27.878133600 -0400 -@@ -2,20 +2,18 @@ - Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc. - Written by Bruno Haible , 2003. - -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This program is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as published by -+ the Free Software Foundation; either version 2.1 of the License, or -+ (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - - /* Tell glibc's to provide a prototype for getline(). @@ -87,6 +85,19 @@ # define FILE_SYSTEM_PREFIX_LEN(P) 0 #endif @@ -138,44 +57,6 @@ /* Original installation prefix. */ static char *orig_prefix; static size_t orig_prefix_len; -@@ -156,7 +167,7 @@ - #endif - } - --#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) -+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) - - /* Convenience function: - Computes the current installation prefix, based on the original -@@ -286,7 +297,7 @@ - - #endif /* !IN_LIBRARY || PIC */ - --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - - /* Full pathname of shared library, or NULL. */ - static char *shared_library_fullname; -@@ -332,7 +343,9 @@ - #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ - /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() - function. -- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ -+ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. -+ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on -+ Cygwin 1.7. */ - FILE *fp; - - /* Open the current process' maps file. It describes one VMA per line. */ -@@ -405,7 +418,7 @@ - const char * - relocate (const char *pathname) - { --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - static int initialized; - - /* Initialization code for a shared library. */ --- old/libiconv-1.14/srclib/relocatable.c 2011-08-07 09:42:06.000000000 -0400 +++ new/libiconv-1.14/srclib/relocatable.c 2011-10-15 03:14:37.739133600 -0400 @@ -3,16 +3,16 @@ @@ -219,51 +100,3 @@ /* Original installation prefix. */ static char *orig_prefix; static size_t orig_prefix_len; -@@ -154,7 +167,7 @@ - #endif - } - --#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) -+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) - - /* Convenience function: - Computes the current installation prefix, based on the original -@@ -284,7 +297,7 @@ - - #endif /* !IN_LIBRARY || PIC */ - --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - - /* Full pathname of shared library, or NULL. */ - static char *shared_library_fullname; -@@ -330,7 +343,9 @@ - #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ - /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() - function. -- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ -+ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. -+ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on -+ Cygwin 1.7. */ - FILE *fp; - - /* Open the current process' maps file. It describes one VMA per line. */ -@@ -403,7 +418,7 @@ - const char * - relocate (const char *pathname) - { --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - static int initialized; - - /* Initialization code for a shared library. */ ---- origsrc/libiconv-1.14/srcm4/gnulib-comp.m4 2011-08-07 09:42:12.000000000 -0400 -+++ src/libiconv-1.14/srcm4/gnulib-comp.m4 2011-08-30 02:40:45.597317000 -0400 -@@ -164,6 +164,7 @@ gl_UNISTD_MODULE_INDICATOR([readlink]) - gl_RELOCATABLE([$gl_source_base]) - if test $RELOCATABLE = yes; then - AC_LIBOBJ([progreloc]) -+ AC_LIBOBJ([relocatable]) - fi - gl_FUNC_READLINK_SEPARATE - gl_CANONICALIZE_LGPL_SEPARATE diff --git a/libiconv/libiconv-1.14-wchar.patch b/libiconv/libiconv-1.14-wchar.patch index 77df3719..5b95c389 100644 --- a/libiconv/libiconv-1.14-wchar.patch +++ b/libiconv/libiconv-1.14-wchar.patch @@ -1,7 +1,6 @@ -diff -urN origsrc//libiconv-1.14/libcharset/lib/localcharset.c src//libiconv-1.14/libcharset/lib/localcharset.c ---- origsrc//libiconv-1.14/libcharset/lib/localcharset.c 2011-02-28 17:43:35.000000000 -0500 -+++ src//libiconv-1.14/libcharset/lib/localcharset.c 2011-08-28 00:16:57.238000000 -0400 -@@ -54,10 +54,6 @@ +--- old/libiconv-1.15/libcharset/lib/localcharset.c.orig 2018-05-01 03:53:41.205796300 -0400 ++++ new/libiconv-1.15/libcharset/lib/localcharset.c 2018-05-01 04:02:53.944507100 -0400 +@@ -53,10 +53,6 @@ # include # endif # endif @@ -9,28 +8,28 @@ diff -urN origsrc//libiconv-1.14/libcharset/lib/localcharset.c src//libiconv-1.1 -# define WIN32_LEAN_AND_MEAN -# include -# endif - #elif defined WIN32_NATIVE + #elif defined WINDOWS_NATIVE # define WIN32_LEAN_AND_MEAN # include -@@ -124,7 +120,7 @@ +@@ -128,7 +124,7 @@ get_charset_aliases (void) cp = charset_aliases; if (cp == NULL) { --#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) -+#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE) +-#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2) ++#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined OS2) const char *dir; const char *base = "charset.alias"; char *file_name; -@@ -309,7 +305,7 @@ +@@ -313,7 +309,7 @@ get_charset_aliases (void) "DECKOREAN" "\0" "EUC-KR" "\0"; # endif --# if defined WIN32_NATIVE || defined __CYGWIN__ -+# if defined WIN32_NATIVE +-# if defined WINDOWS_NATIVE || defined __CYGWIN__ ++# if defined WINDOWS_NATIVE /* To avoid the troubles of installing a separate file in the same directory as the DLL and of retrieving the DLL's directory at runtime, simply inline the aliases here. */ -@@ -365,64 +361,12 @@ +@@ -399,64 +395,12 @@ locale_charset (void) # if HAVE_LANGINFO_CODESET @@ -77,10 +76,10 @@ diff -urN origsrc//libiconv-1.14/libcharset/lib/localcharset.c src//libiconv-1.1 - } - } - -- /* Woe32 has a function returning the locale's codepage as a number: -- GetACP(). This encoding is used by Cygwin, unless the user has set -- the environment variable CYGWIN=codepage:oem (which very few people -- do). +- /* The Windows API has a function returning the locale's codepage as a +- number: GetACP(). This encoding is used by Cygwin, unless the user +- has set the environment variable CYGWIN=codepage:oem (which very few +- people do). - Output directed to console windows needs to be converted (to - GetOEMCP() if the console is using a raster font, or to - GetConsoleOutputCP() if it is using a TrueType font). Cygwin does @@ -95,9 +94,9 @@ diff -urN origsrc//libiconv-1.14/libcharset/lib/localcharset.c src//libiconv-1.1 + /* Most systems support nl_langinfo (CODESET) nowadays. + POSIX allows that the returned pointer may point to a static area that + may be overwritten by subsequent calls to setlocale or nl_langinfo. */ -+ static char codeset_buf[64]; ++ static char codeset_buf[65]; + codeset_buf[0] = '\0'; -+ codeset = strncat (codeset_buf, nl_langinfo (CODESET), sizeof (codeset_buf)); ++ codeset = strncat (codeset_buf, nl_langinfo (CODESET), sizeof (codeset_buf - 1)); # else diff --git a/libiconv/msys2-libiconv-1.14.patch b/libiconv/msys2-libiconv-1.14.patch index 3e10b94c..2f2e661e 100644 --- a/libiconv/msys2-libiconv-1.14.patch +++ b/libiconv/msys2-libiconv-1.14.patch @@ -81,31 +81,19 @@ diff -Naur libiconv-1.14/build-aux/config.rpath libiconv-1.14-m/build-aux/config shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur libiconv-1.14/build-aux/config.sub libiconv-1.14-m/build-aux/config.sub ---- libiconv-1.14/build-aux/config.sub 2009-06-21 15:17:33 +0400 -+++ libiconv-1.14-m/build-aux/config.sub 2013-02-12 08:54:17 +0400 -@@ -1273,7 +1273,7 @@ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ -diff -Naur libiconv-1.14/build-aux/ltmain.sh libiconv-1.14-m/build-aux/ltmain.sh ---- libiconv-1.14/build-aux/ltmain.sh 2010-09-24 03:27:59 +0400 -+++ libiconv-1.14-m/build-aux/ltmain.sh 2013-02-12 09:00:12 +0400 -@@ -1179,7 +1179,7 @@ - test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in -- *cygwin* | *mingw* | *pw32* | *cegcc*) -+ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; -@@ -2122,7 +2122,7 @@ +diff -Naur libiconv-1.15/build-aux/ltmain.sh.orig libiconv-1.15/build-aux/ltmain.sh +--- libiconv-1.15/build-aux/ltmain.sh.orig 2015-06-28 08:55:35.000000000 -0400 ++++ libiconv-1.15/build-aux/ltmain.sh 2018-05-01 13:24:12.702942300 -0400 +@@ -2418,7 +2418,7 @@ libtool_validate_options () + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 +- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) ++ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; +@@ -3439,7 +3439,7 @@ func_mode_compile () # On Cygwin there's no "real" PIC flag so we must build both object types case $host_os in @@ -114,16 +102,16 @@ diff -Naur libiconv-1.14/build-aux/ltmain.sh libiconv-1.14-m/build-aux/ltmain.sh pic_mode=default ;; esac -@@ -2991,7 +2991,7 @@ +@@ -4313,7 +4313,7 @@ func_mode_install () 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | msys* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" -@@ -3097,7 +3097,7 @@ + tstripme= +@@ -4426,7 +4426,7 @@ func_mode_install () # Do a test to see if this is really a libtool program. case $host in @@ -132,7 +120,7 @@ diff -Naur libiconv-1.14/build-aux/ltmain.sh libiconv-1.14-m/build-aux/ltmain.sh if func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" wrapper=$func_ltwrapper_scriptname_result -@@ -3172,7 +3172,7 @@ +@@ -4501,7 +4501,7 @@ func_mode_install () # remove .exe since cygwin /usr/bin/install will append another # one anyway case $install_prog,$host in @@ -141,16 +129,16 @@ diff -Naur libiconv-1.14/build-aux/ltmain.sh libiconv-1.14-m/build-aux/ltmain.sh case $file:$destfile in *.exe:*.exe) # this is ok -@@ -3320,7 +3320,7 @@ +@@ -4654,7 +4654,7 @@ extern \"C\" { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in - *cygwin* | *mingw* | *cegcc* ) + *cygwin* | *msys* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ;; -@@ -3332,7 +3332,7 @@ +@@ -4666,7 +4666,7 @@ extern \"C\" { eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -159,43 +147,43 @@ diff -Naur libiconv-1.14/build-aux/ltmain.sh libiconv-1.14-m/build-aux/ltmain.sh eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; -@@ -3346,7 +3346,7 @@ +@@ -4680,7 +4680,7 @@ extern \"C\" { func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in - *cygwin* | *mingw* | *cegcc* ) + *cygwin* | *msys* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" -@@ -3499,7 +3499,7 @@ +@@ -4855,7 +4855,7 @@ static const void *lt_preloaded_setup() # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in - *cygwin* | *mingw* | *cegcc* ) + *cygwin* | *msys* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -@@ -4369,7 +4369,7 @@ +@@ -5753,7 +5753,7 @@ main (int argc, char *argv[]) { EOF - case "$host" in + case $host in - *mingw* | *cygwin* ) + *mingw* | *cygwin* | *msys* ) # make stdout use "unix" line endings echo " setmode(1,_O_BINARY);" ;; -@@ -5082,7 +5082,7 @@ - { - $opt_debug +@@ -6492,7 +6492,7 @@ func_mode_link () + $debug_cmd + case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra -@@ -5569,7 +5569,7 @@ + # what system we are compiling for in order to pass an extra +@@ -6991,7 +6991,7 @@ func_mode_link () ;; esac case $host in @@ -204,16 +192,16 @@ diff -Naur libiconv-1.14/build-aux/ltmain.sh libiconv-1.14-m/build-aux/ltmain.sh testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; -@@ -5589,7 +5589,7 @@ +@@ -7011,7 +7011,7 @@ func_mode_link () -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) continue ;; -@@ -5666,7 +5666,7 @@ +@@ -7094,7 +7094,7 @@ func_mode_link () -no-install) case $host in @@ -221,36 +209,36 @@ diff -Naur libiconv-1.14/build-aux/ltmain.sh libiconv-1.14-m/build-aux/ltmain.sh + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" -@@ -6531,7 +6531,7 @@ + func_warning "'-no-install' is ignored for $host" +@@ -7988,7 +7988,7 @@ func_mode_link () fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) + *cygwin* | *msys* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both # static and shared are present. Therefore, ensure we extract # symbols from the import library if a shared library is present -@@ -6675,7 +6675,7 @@ +@@ -8132,7 +8132,7 @@ func_mode_link () if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in -- *cygwin* | *mingw* | *cegcc*) -+ *cygwin* | *msys* | *mingw* | *cegcc*) +- *cygwin* | *mingw* | *cegcc* | *os2*) ++ *cygwin* | *msys* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no -@@ -6745,7 +6745,7 @@ +@@ -8202,7 +8202,7 @@ func_mode_link () elif test -n "$soname_spec"; then # bleh windows case $host in -- *cygwin* | mingw* | *cegcc*) -+ *cygwin* | *msys* | mingw* | *cegcc*) +- *cygwin* | mingw* | *cegcc* | *os2*) ++ *cygwin* | *msys* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" -@@ -7605,7 +7605,7 @@ - if test "$build_libtool_libs" = yes; then + versuffix=-$major +@@ -9112,7 +9112,7 @@ func_mode_link () + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -258,7 +246,7 @@ diff -Naur libiconv-1.14/build-aux/ltmain.sh libiconv-1.14-m/build-aux/ltmain.sh # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) -@@ -8118,7 +8118,7 @@ +@@ -9626,7 +9626,7 @@ EOF orig_export_symbols= case $host_os in @@ -266,8 +254,8 @@ diff -Naur libiconv-1.14/build-aux/ltmain.sh libiconv-1.14-m/build-aux/ltmain.sh + cygwin* | msys* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then -@@ -8674,7 +8674,7 @@ + func_dll_def_p "$export_symbols" || { +@@ -10185,7 +10185,7 @@ EOF prog) case $host in @@ -276,25 +264,25 @@ diff -Naur libiconv-1.14/build-aux/ltmain.sh libiconv-1.14-m/build-aux/ltmain.sh output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ -@@ -8787,7 +8787,7 @@ +@@ -10296,7 +10296,7 @@ EOF esac fi case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; -@@ -8865,7 +8865,7 @@ +@@ -10374,7 +10374,7 @@ EOF # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; - *cygwin* | *mingw* ) + *cygwin* | *msys* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi -@@ -9012,14 +9012,14 @@ + test yes = "$build_libtool_libs" || wrappers_required=false + ;; + *) +@@ -10520,14 +10520,14 @@ EOF esac # test for cygwin because mv fails w/o .exe extensions case $host in @@ -311,19 +299,19 @@ diff -Naur libiconv-1.14/build-aux/ltmain.sh libiconv-1.14-m/build-aux/ltmain.sh func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result -@@ -9346,7 +9346,7 @@ +@@ -10859,7 +10859,7 @@ EOF # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then + func_relative_path "$install_libdir" "$bindir" diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure ---- libiconv-1.14/configure 2011-08-07 21:49:02 +0400 -+++ libiconv-1.14-m/configure 2013-02-12 08:49:33 +0400 -@@ -6502,7 +6502,7 @@ +--- libiconv-1.15/configure.orig 2017-01-01 18:02:55.000000000 -0500 ++++ libiconv-1.15/configure 2018-05-01 17:59:23.290829700 -0400 +@@ -7225,7 +7225,7 @@ else lt_cv_sys_max_cmd_len=-1; ;; @@ -332,7 +320,7 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -6686,7 +6686,7 @@ +@@ -7391,7 +7391,7 @@ else *-*-mingw* ) # actually msys lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ;; @@ -341,7 +329,7 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ;; * ) # otherwise, assume *nix -@@ -6694,12 +6694,12 @@ +@@ -7399,12 +7399,12 @@ else ;; esac ;; @@ -356,16 +344,16 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure lt_cv_to_host_file_cmd=func_convert_file_noop ;; * ) # otherwise, assume *nix -@@ -6765,7 +6765,7 @@ +@@ -7470,7 +7470,7 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | msys* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi -@@ -6920,7 +6920,7 @@ +@@ -7625,7 +7625,7 @@ bsdi[45]*) lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -374,16 +362,16 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' -@@ -7238,7 +7238,7 @@ +@@ -7941,7 +7941,7 @@ else lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | msys* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in -@@ -7730,7 +7730,7 @@ +@@ -8433,7 +8433,7 @@ case $host_os in aix*) symcode='[BCDT]' ;; @@ -392,7 +380,7 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure symcode='[ABCDGISTW]' ;; hpux*) -@@ -8997,7 +8997,7 @@ +@@ -9939,7 +9939,7 @@ fi enable_win32_dll=yes case $host in @@ -401,7 +389,7 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 -@@ -9807,7 +9807,7 @@ +@@ -10812,7 +10812,7 @@ lt_prog_compiler_static= # PIC is the default for these OSes. ;; @@ -410,8 +398,8 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -9889,7 +9889,7 @@ - fi +@@ -10915,7 +10915,7 @@ lt_prog_compiler_static= + esac ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) @@ -419,7 +407,7 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' -@@ -10366,7 +10366,7 @@ +@@ -11417,7 +11417,7 @@ $as_echo_n "checking whether the $compil extract_expsyms_cmds= case $host_os in @@ -428,7 +416,7 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. -@@ -10481,7 +10481,7 @@ +@@ -11532,7 +11532,7 @@ _LT_EOF fi ;; @@ -437,7 +425,7 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' -@@ -10939,7 +10939,7 @@ +@@ -12072,7 +12072,7 @@ fi export_dynamic_flag_spec=-rdynamic ;; @@ -446,16 +434,16 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -11900,7 +11900,7 @@ +@@ -13107,7 +13107,7 @@ bsdi[45]*) # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | msys* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no -@@ -11932,6 +11932,12 @@ +@@ -13139,6 +13139,12 @@ cygwin* | mingw* | pw32* | cegcc*) sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; @@ -467,8 +455,8 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure + ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -11966,7 +11972,7 @@ + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' +@@ -13173,7 +13179,7 @@ cygwin* | mingw* | pw32* | cegcc*) # Convert to MSYS style. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; @@ -477,16 +465,16 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure # Convert to unix form, then to dos form, then back to unix form # but this time dos style (no spaces!) so that the unix form looks # like /cygdrive/c/PROGRA~1:/cygdr... -@@ -12630,7 +12636,7 @@ +@@ -13875,7 +13881,7 @@ else lt_cv_dlopen_libs= ;; - cygwin*) + cygwin* | msys*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; -@@ -13420,7 +13426,7 @@ +@@ -14672,7 +14678,7 @@ CFLAGS=$lt_save_CFLAGS case "$host_os" in @@ -495,7 +483,7 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure *) is_woe32=no ;; esac WOE32=$is_woe32 -@@ -16651,7 +16657,7 @@ +@@ -18002,7 +18008,7 @@ else # special semantics and is distinct from /, please report it to # . case $host in @@ -504,7 +492,7 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure gl_cv_double_slash_root=yes ;; *) # Be optimistic and assume that / and // are the same when we -@@ -19824,7 +19830,7 @@ +@@ -22196,7 +22202,7 @@ else # special semantics and is distinct from /, please report it to # . case $host in @@ -513,7 +501,7 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure gl_cv_double_slash_root=yes ;; *) # Be optimistic and assume that / and // are the same when we -@@ -21629,7 +21635,7 @@ +@@ -24665,7 +24671,7 @@ $as_echo "#define USE_UNLOCKED_IO 1" >>c if test "$enable_shared" = yes; then case "$host_os" in @@ -522,18 +510,18 @@ diff -Naur libiconv-1.14/configure libiconv-1.14-m/configure *) is_woe32dll=no ;; esac else -diff -Naur libiconv-1.14/configure.ac libiconv-1.14-m/configure.ac ---- libiconv-1.14/configure.ac 2011-08-07 21:48:03 +0400 -+++ libiconv-1.14-m/configure.ac 2013-02-12 10:41:24 +0400 -@@ -20,6 +20,7 @@ - AC_INIT +diff -Naur libiconv-1.15/configure.ac.orig libiconv-1.15/configure.ac +--- libiconv-1.15/configure.ac.orig 2016-12-04 07:33:04.000000000 -0500 ++++ libiconv-1.15/configure.ac 2018-05-01 17:27:00.747183900 -0400 +@@ -19,6 +19,7 @@ AC_PREREQ([2.60]) + AC_INIT([libiconv], [1.15]) AC_CONFIG_SRCDIR([lib/iconv.c]) AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([libiconv], [1.14]) + AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([config.h lib/config.h]) AC_PROG_MAKE_SET -@@ -86,7 +87,7 @@ +@@ -85,7 +86,7 @@ LT_LANG([Windows Resource]) dnl On mingw and Cygwin, we can activate special Makefile rules which add dnl version information to the executables. case "$host_os" in @@ -542,7 +530,7 @@ diff -Naur libiconv-1.14/configure.ac libiconv-1.14-m/configure.ac *) is_woe32=no ;; esac WOE32=$is_woe32 -@@ -174,7 +175,7 @@ +@@ -173,7 +174,7 @@ dnl must arrange to define the auxili dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then case "$host_os" in @@ -572,20 +560,19 @@ diff -Naur libiconv-1.14/libcharset/INTEGRATE libiconv-1.14-m/libcharset/INTEGRA need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur libiconv-1.14/libcharset/build-aux/config.guess libiconv-1.14-m/libcharset/build-aux/config.guess ---- libiconv-1.14/libcharset/build-aux/config.guess 2009-06-21 15:17:33 +0400 -+++ libiconv-1.14-m/libcharset/build-aux/config.guess 2013-02-12 09:07:45 +0400 -@@ -774,6 +774,9 @@ - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - i*:MINGW*:*) +diff -Naur libiconv-1.15/libcharset/build-aux/config.guess libiconv-1.14-m/libcharset/build-aux/config.guess +--- libiconv-1.15/libcharset/build-aux/config.guess.orig 2017-01-01 18:02:46.000000000 -0500 ++++ libiconv-1.15/libcharset/build-aux/config.guess 2018-05-01 16:36:17.998567100 -0400 +@@ -851,7 +851,7 @@ EOF + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; -@@ -802,6 +805,9 @@ +- *:MSYS*:*) ++ i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) +@@ -891,6 +891,9 @@ EOF amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; @@ -595,43 +582,31 @@ diff -Naur libiconv-1.14/libcharset/build-aux/config.guess libiconv-1.14-m/libch p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit ;; -diff -Naur libiconv-1.14/libcharset/build-aux/config.libpath libiconv-1.14-m/libcharset/build-aux/config.libpath ---- libiconv-1.14/libcharset/build-aux/config.libpath 2009-06-21 15:17:33 +0400 -+++ libiconv-1.14-m/libcharset/build-aux/config.libpath 2013-02-12 09:22:01 +0400 -@@ -57,7 +57,7 @@ - bsdi4*) +diff -Naur libiconv-1.15/libcharset/build-aux/config.libpath.orig libiconv-1.15/libcharset/build-aux/config.libpath +--- libiconv-1.15/libcharset/build-aux/config.libpath.orig 2018-05-01 16:21:01.970797700 -0400 ++++ libiconv-1.15/libcharset/build-aux/config.libpath 2018-05-01 16:42:04.348278900 -0400 +@@ -56,7 +56,7 @@ case $host_os in + bsdi[45]*) shlibpath_var=LD_LIBRARY_PATH ;; -- cygwin* | mingw* | pw32*) -+ cygwin* | msys* | mingw* | pw32*) +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -diff -Naur libiconv-1.14/libcharset/build-aux/config.sub libiconv-1.14-m/libcharset/build-aux/config.sub ---- libiconv-1.14/libcharset/build-aux/config.sub 2009-06-21 15:17:33 +0400 -+++ libiconv-1.14-m/libcharset/build-aux/config.sub 2013-02-12 09:22:27 +0400 -@@ -1205,7 +1205,7 @@ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ -diff -Naur libiconv-1.14/libcharset/build-aux/ltmain.sh libiconv-1.14-m/libcharset/build-aux/ltmain.sh ---- libiconv-1.14/libcharset/build-aux/ltmain.sh 2010-09-24 03:27:59 +0400 -+++ libiconv-1.14-m/libcharset/build-aux/ltmain.sh 2013-02-12 09:26:55 +0400 -@@ -1179,7 +1179,7 @@ - test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in -- *cygwin* | *mingw* | *pw32* | *cegcc*) -+ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; -@@ -2122,7 +2122,7 @@ +diff -Naur ibiconv-1.15/libcharset/build-aux/ltmain.sh.orig ibiconv-1.15/libcharset/build-aux/ltmain.sh +--- libiconv-1.15/libcharset/build-aux/ltmain.sh.orig 2015-06-28 08:55:35.000000000 -0400 ++++ libiconv-1.15/libcharset/build-aux/ltmain.sh 2018-05-01 13:47:41.812271300 -0400 +@@ -2418,7 +2418,7 @@ libtool_validate_options () + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 +- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) ++ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; +@@ -3439,7 +3439,7 @@ func_mode_compile () # On Cygwin there's no "real" PIC flag so we must build both object types case $host_os in @@ -640,16 +615,16 @@ diff -Naur libiconv-1.14/libcharset/build-aux/ltmain.sh libiconv-1.14-m/libchars pic_mode=default ;; esac -@@ -2991,7 +2991,7 @@ +@@ -4313,7 +4313,7 @@ func_mode_install () 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | msys* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" -@@ -3097,7 +3097,7 @@ + tstripme= +@@ -4426,7 +4426,7 @@ func_mode_install () # Do a test to see if this is really a libtool program. case $host in @@ -658,7 +633,7 @@ diff -Naur libiconv-1.14/libcharset/build-aux/ltmain.sh libiconv-1.14-m/libchars if func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" wrapper=$func_ltwrapper_scriptname_result -@@ -3172,7 +3172,7 @@ +@@ -4501,7 +4501,7 @@ func_mode_install () # remove .exe since cygwin /usr/bin/install will append another # one anyway case $install_prog,$host in @@ -667,16 +642,16 @@ diff -Naur libiconv-1.14/libcharset/build-aux/ltmain.sh libiconv-1.14-m/libchars case $file:$destfile in *.exe:*.exe) # this is ok -@@ -3320,7 +3320,7 @@ +@@ -4654,7 +4654,7 @@ extern \"C\" { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in - *cygwin* | *mingw* | *cegcc* ) + *cygwin* | *msys* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ;; -@@ -3332,7 +3332,7 @@ +@@ -4666,7 +4666,7 @@ extern \"C\" { eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -685,43 +660,43 @@ diff -Naur libiconv-1.14/libcharset/build-aux/ltmain.sh libiconv-1.14-m/libchars eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; -@@ -3346,7 +3346,7 @@ +@@ -4680,7 +4680,7 @@ extern \"C\" { func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in - *cygwin* | *mingw* | *cegcc* ) + *cygwin* | *msys* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" -@@ -3499,7 +3499,7 @@ +@@ -4855,7 +4855,7 @@ static const void *lt_preloaded_setup() # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in - *cygwin* | *mingw* | *cegcc* ) + *cygwin* | *msys* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -@@ -4369,7 +4369,7 @@ +@@ -5753,7 +5753,7 @@ main (int argc, char *argv[]) { EOF - case "$host" in + case $host in - *mingw* | *cygwin* ) + *mingw* | *msys* | *cygwin* ) # make stdout use "unix" line endings echo " setmode(1,_O_BINARY);" ;; -@@ -5082,7 +5082,7 @@ - { - $opt_debug +@@ -6492,7 +6492,7 @@ func_mode_link () + $debug_cmd + case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra -@@ -5569,7 +5569,7 @@ + # what system we are compiling for in order to pass an extra +@@ -6991,7 +6991,7 @@ func_mode_link () ;; esac case $host in @@ -730,16 +705,16 @@ diff -Naur libiconv-1.14/libcharset/build-aux/ltmain.sh libiconv-1.14-m/libchars testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; -@@ -5589,7 +5589,7 @@ +@@ -7011,7 +7011,7 @@ func_mode_link () -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) continue ;; -@@ -5666,7 +5666,7 @@ +@@ -7094,7 +7094,7 @@ func_mode_link () -no-install) case $host in @@ -747,36 +722,36 @@ diff -Naur libiconv-1.14/libcharset/build-aux/ltmain.sh libiconv-1.14-m/libchars + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" -@@ -6531,7 +6531,7 @@ + func_warning "'-no-install' is ignored for $host" +@@ -7988,7 +7988,7 @@ func_mode_link () fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) + *cygwin* | *msys* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both # static and shared are present. Therefore, ensure we extract # symbols from the import library if a shared library is present -@@ -6675,7 +6675,7 @@ +@@ -8132,7 +8132,7 @@ func_mode_link () if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in -- *cygwin* | *mingw* | *cegcc*) -+ *cygwin* | *msys* | *mingw* | *cegcc*) +- *cygwin* | *mingw* | *cegcc* | *os2*) ++ *cygwin* | *msys* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no -@@ -6745,7 +6745,7 @@ +@@ -8202,7 +8202,7 @@ func_mode_link () elif test -n "$soname_spec"; then # bleh windows case $host in -- *cygwin* | mingw* | *cegcc*) -+ *cygwin* | *msys* | mingw* | *cegcc*) +- *cygwin* | mingw* | *cegcc* | *os2*) ++ *cygwin* | *msys* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" -@@ -7605,7 +7605,7 @@ - if test "$build_libtool_libs" = yes; then + versuffix=-$major +@@ -9112,7 +9112,7 @@ func_mode_link () + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -784,7 +759,7 @@ diff -Naur libiconv-1.14/libcharset/build-aux/ltmain.sh libiconv-1.14-m/libchars # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) -@@ -8118,7 +8118,7 @@ +@@ -9626,7 +9626,7 @@ EOF orig_export_symbols= case $host_os in @@ -792,8 +767,8 @@ diff -Naur libiconv-1.14/libcharset/build-aux/ltmain.sh libiconv-1.14-m/libchars + cygwin* | msys* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then -@@ -8674,7 +8674,7 @@ + func_dll_def_p "$export_symbols" || { +@@ -10185,7 +10185,7 @@ EOF prog) case $host in @@ -802,25 +777,25 @@ diff -Naur libiconv-1.14/libcharset/build-aux/ltmain.sh libiconv-1.14-m/libchars output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ -@@ -8787,7 +8787,7 @@ +@@ -10296,7 +10296,7 @@ EOF esac fi case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; -@@ -8865,7 +8865,7 @@ +@@ -10374,7 +10374,7 @@ EOF # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; - *cygwin* | *mingw* ) + *cygwin* | *msys* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi -@@ -9012,14 +9012,14 @@ + test yes = "$build_libtool_libs" || wrappers_required=false + ;; + *) +@@ -10520,14 +10520,14 @@ EOF esac # test for cygwin because mv fails w/o .exe extensions case $host in @@ -837,19 +812,19 @@ diff -Naur libiconv-1.14/libcharset/build-aux/ltmain.sh libiconv-1.14-m/libchars func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result -@@ -9346,7 +9346,7 @@ +@@ -10859,7 +10859,7 @@ EOF # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then + func_relative_path "$install_libdir" "$bindir" diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configure ---- libiconv-1.14/libcharset/configure 2011-08-07 21:49:19 +0400 -+++ libiconv-1.14-m/libcharset/configure 2013-02-12 09:05:21 +0400 -@@ -4291,7 +4291,7 @@ +--- libiconv-1.15/libcharset/configure.orig 2017-01-01 18:03:38.000000000 -0500 ++++ libiconv-1.15/libcharset/configure 2018-05-01 18:11:56.170073200 -0400 +@@ -4316,7 +4316,7 @@ else lt_cv_sys_max_cmd_len=-1; ;; @@ -858,7 +833,7 @@ diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configu # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -4475,7 +4475,7 @@ +@@ -4482,7 +4482,7 @@ else *-*-mingw* ) # actually msys lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ;; @@ -867,7 +842,7 @@ diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configu lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ;; * ) # otherwise, assume *nix -@@ -4483,12 +4483,12 @@ +@@ -4490,12 +4490,12 @@ else ;; esac ;; @@ -882,16 +857,16 @@ diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configu lt_cv_to_host_file_cmd=func_convert_file_noop ;; * ) # otherwise, assume *nix -@@ -4554,7 +4554,7 @@ +@@ -4561,7 +4561,7 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | msys* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi -@@ -4709,7 +4709,7 @@ +@@ -4716,7 +4716,7 @@ bsdi[45]*) lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -900,16 +875,16 @@ diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configu # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' -@@ -5027,7 +5027,7 @@ +@@ -5032,7 +5032,7 @@ else lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | msys* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in -@@ -5561,7 +5561,7 @@ +@@ -5566,7 +5566,7 @@ case $host_os in aix*) symcode='[BCDT]' ;; @@ -918,7 +893,7 @@ diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configu symcode='[ABCDGISTW]' ;; hpux*) -@@ -6799,7 +6799,7 @@ +@@ -7043,7 +7043,7 @@ done enable_win32_dll=yes case $host in @@ -927,7 +902,7 @@ diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 -@@ -7639,7 +7639,7 @@ +@@ -7946,7 +7946,7 @@ lt_prog_compiler_static= # PIC is the default for these OSes. ;; @@ -936,8 +911,8 @@ diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configu # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -7721,7 +7721,7 @@ - fi +@@ -8049,7 +8049,7 @@ lt_prog_compiler_static= + esac ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) @@ -945,7 +920,7 @@ diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configu # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' -@@ -8198,7 +8198,7 @@ +@@ -8551,7 +8551,7 @@ $as_echo_n "checking whether the $compil extract_expsyms_cmds= case $host_os in @@ -954,7 +929,7 @@ diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configu # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. -@@ -8313,7 +8313,7 @@ +@@ -8666,7 +8666,7 @@ _LT_EOF fi ;; @@ -963,7 +938,7 @@ diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configu # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' -@@ -8771,7 +8771,7 @@ +@@ -9206,7 +9206,7 @@ fi export_dynamic_flag_spec=-rdynamic ;; @@ -972,16 +947,16 @@ diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configu # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -9732,7 +9732,7 @@ +@@ -10241,7 +10241,7 @@ bsdi[45]*) # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | msys* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no -@@ -9764,6 +9764,12 @@ +@@ -10273,6 +10273,12 @@ cygwin* | mingw* | pw32* | cegcc*) sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; @@ -993,8 +968,8 @@ diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configu + ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -9798,7 +9804,7 @@ + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' +@@ -10307,7 +10313,7 @@ cygwin* | mingw* | pw32* | cegcc*) # Convert to MSYS style. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; @@ -1003,13 +978,13 @@ diff -Naur libiconv-1.14/libcharset/configure libiconv-1.14-m/libcharset/configu # Convert to unix form, then to dos form, then back to unix form # but this time dos style (no spaces!) so that the unix form looks # like /cygdrive/c/PROGRA~1:/cygdr... -@@ -10462,7 +10468,7 @@ +@@ -11009,7 +11015,7 @@ else lt_cv_dlopen_libs= ;; - cygwin*) + cygwin* | msys*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; diff -Naur libiconv-1.14/libcharset/configure.ac libiconv-1.14-m/libcharset/configure.ac @@ -1035,10 +1010,10 @@ diff -Naur libiconv-1.14/libcharset/lib/Makefile.in libiconv-1.14-m/libcharset/l need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/libtool.m4 ---- libiconv-1.14/libcharset/m4/libtool.m4 2010-09-24 03:27:59 +0400 -+++ libiconv-1.14-m/libcharset/m4/libtool.m4 2013-02-12 09:33:06 +0400 -@@ -1559,7 +1559,7 @@ +diff -Naur libiconv-1.15/libcharset/m4/libtool.m4.orig libiconv-1.15/libcharset/m4/libtool.m4 +--- libiconv-1.15/libcharset/m4/libtool.m4.orig 2016-10-22 12:37:37.000000000 -0400 ++++ libiconv-1.15/libcharset/m4/libtool.m4 2018-05-01 16:57:19.457530500 -0400 +@@ -1692,7 +1692,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d lt_cv_sys_max_cmd_len=-1; ;; @@ -1047,25 +1022,25 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -1801,7 +1801,7 @@ +@@ -1940,7 +1940,7 @@ else lt_cv_dlopen_libs= ;; - cygwin*) + cygwin* | msys*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; -@@ -2272,7 +2272,7 @@ +@@ -2521,7 +2521,7 @@ bsdi[[45]]*) # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | msys* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no -@@ -2304,6 +2304,12 @@ +@@ -2553,6 +2553,12 @@ cygwin* | mingw* | pw32* | cegcc*) m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -1077,8 +1052,8 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ + ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -@@ -2338,7 +2344,7 @@ + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' +@@ -2587,7 +2593,7 @@ m4_if([$1], [],[ # Convert to MSYS style. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; @@ -1087,16 +1062,16 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ # Convert to unix form, then to dos form, then back to unix form # but this time dos style (no spaces!) so that the unix form looks # like /cygdrive/c/PROGRA~1:/cygdr... -@@ -3081,7 +3087,7 @@ +@@ -3365,7 +3371,7 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | msys* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi -@@ -3137,7 +3143,7 @@ +@@ -3458,7 +3464,7 @@ bsdi[[45]]*) lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -1105,16 +1080,16 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' -@@ -3447,7 +3453,7 @@ +@@ -3771,7 +3777,7 @@ lt_cv_sharedlib_from_linklib_cmd, [lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | msys* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in -@@ -3502,7 +3508,7 @@ +@@ -3841,7 +3847,7 @@ AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in @@ -1123,7 +1098,7 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) -@@ -3577,7 +3583,7 @@ +@@ -3916,7 +3922,7 @@ case $host_os in aix*) symcode='[[BCDT]]' ;; @@ -1132,7 +1107,7 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ symcode='[[ABCDGISTW]]' ;; hpux*) -@@ -3844,7 +3850,7 @@ +@@ -4222,7 +4228,7 @@ m4_if([$1], [CXX], [ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; @@ -1141,7 +1116,7 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -3915,7 +3921,7 @@ +@@ -4298,7 +4304,7 @@ m4_if([$1], [CXX], [ ;; esac ;; @@ -1150,7 +1125,7 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], -@@ -4162,7 +4168,7 @@ +@@ -4546,7 +4552,7 @@ m4_if([$1], [CXX], [ # PIC is the default for these OSes. ;; @@ -1159,8 +1134,8 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -4245,7 +4251,7 @@ - fi +@@ -4650,7 +4656,7 @@ m4_if([$1], [CXX], [ + esac ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) @@ -1168,16 +1143,16 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], -@@ -4490,7 +4496,7 @@ +@@ -4925,7 +4931,7 @@ m4_if([$1], [CXX], [ pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; - cygwin* | mingw* | cegcc*) + cygwin* | msys* | mingw* | cegcc*) case $cc_basename in - cl*) ;; - *) -@@ -4547,7 +4553,7 @@ + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' +@@ -4983,7 +4989,7 @@ dnl Note also adjust exclude_expsyms for extract_expsyms_cmds= case $host_os in @@ -1186,7 +1161,7 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. -@@ -4662,7 +4668,7 @@ +@@ -5098,7 +5104,7 @@ _LT_EOF fi ;; @@ -1195,7 +1170,7 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -@@ -5036,7 +5042,7 @@ +@@ -5554,7 +5560,7 @@ _LT_EOF _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; @@ -1204,7 +1179,7 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -6045,7 +6051,7 @@ +@@ -6629,7 +6635,7 @@ if test yes != "$_lt_caught_CXX_error"; esac ;; @@ -1213,7 +1188,7 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ case $GXX,$cc_basename in ,cl* | no,cl*) # Native MSVC -@@ -7779,7 +7785,7 @@ +@@ -8317,7 +8323,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd, *-*-mingw* ) # actually msys lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ;; @@ -1222,7 +1197,7 @@ diff -Naur libiconv-1.14/libcharset/m4/libtool.m4 libiconv-1.14-m/libcharset/m4/ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ;; * ) # otherwise, assume *nix -@@ -7787,12 +7793,12 @@ +@@ -8325,12 +8331,12 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd, ;; esac ;; @@ -1250,9 +1225,9 @@ diff -Naur libiconv-1.14/libcharset/m4/ltoptions.m4 libiconv-1.14-m/libcharset/m AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 ---- libiconv-1.14/m4/libtool.m4 2010-09-24 03:27:59 +0400 -+++ libiconv-1.14-m/m4/libtool.m4 2013-02-12 09:33:06 +0400 -@@ -1559,7 +1559,7 @@ +--- libiconv-1.15/m4/libtool.m4.orig 2016-10-22 12:37:37.000000000 -0400 ++++ libiconv-1.15/m4/libtool.m4 2018-05-01 17:10:21.567506500 -0400 +@@ -1692,7 +1692,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d lt_cv_sys_max_cmd_len=-1; ;; @@ -1261,25 +1236,25 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -1801,7 +1801,7 @@ +@@ -1940,7 +1940,7 @@ else lt_cv_dlopen_libs= ;; - cygwin*) + cygwin* | msys*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; -@@ -2272,7 +2272,7 @@ +@@ -2521,7 +2521,7 @@ bsdi[[45]]*) # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | msys* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no -@@ -2304,6 +2304,12 @@ +@@ -2553,6 +2553,12 @@ cygwin* | mingw* | pw32* | cegcc*) m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -1291,8 +1266,8 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 + ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -@@ -2338,7 +2344,7 @@ + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' +@@ -2587,7 +2593,7 @@ m4_if([$1], [],[ # Convert to MSYS style. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; @@ -1301,16 +1276,16 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 # Convert to unix form, then to dos form, then back to unix form # but this time dos style (no spaces!) so that the unix form looks # like /cygdrive/c/PROGRA~1:/cygdr... -@@ -3081,7 +3087,7 @@ +@@ -3365,7 +3371,7 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | msys* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi -@@ -3137,7 +3143,7 @@ +@@ -3458,7 +3464,7 @@ bsdi[[45]]*) lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -1319,16 +1294,16 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' -@@ -3447,7 +3453,7 @@ +@@ -3771,7 +3777,7 @@ lt_cv_sharedlib_from_linklib_cmd, [lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | msys* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in -@@ -3502,7 +3508,7 @@ +@@ -3841,7 +3847,7 @@ AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in @@ -1337,7 +1312,7 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) -@@ -3577,7 +3583,7 @@ +@@ -3916,7 +3922,7 @@ case $host_os in aix*) symcode='[[BCDT]]' ;; @@ -1346,7 +1321,7 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 symcode='[[ABCDGISTW]]' ;; hpux*) -@@ -3844,7 +3850,7 @@ +@@ -4222,7 +4228,7 @@ m4_if([$1], [CXX], [ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; @@ -1355,7 +1330,7 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -3915,7 +3921,7 @@ +@@ -4298,7 +4304,7 @@ m4_if([$1], [CXX], [ ;; esac ;; @@ -1364,7 +1339,7 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], -@@ -4162,7 +4168,7 @@ +@@ -4546,7 +4552,7 @@ m4_if([$1], [CXX], [ # PIC is the default for these OSes. ;; @@ -1373,8 +1348,8 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -4245,7 +4251,7 @@ - fi +@@ -4650,7 +4656,7 @@ m4_if([$1], [CXX], [ + esac ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) @@ -1382,16 +1357,16 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], -@@ -4490,7 +4496,7 @@ +@@ -4925,7 +4931,7 @@ m4_if([$1], [CXX], [ pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; - cygwin* | mingw* | cegcc*) + cygwin* | msys* | mingw* | cegcc*) case $cc_basename in - cl*) ;; - *) -@@ -4547,7 +4553,7 @@ + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' +@@ -4983,7 +4989,7 @@ dnl Note also adjust exclude_expsyms for extract_expsyms_cmds= case $host_os in @@ -1400,7 +1375,7 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. -@@ -4662,7 +4668,7 @@ +@@ -5098,7 +5104,7 @@ _LT_EOF fi ;; @@ -1409,7 +1384,7 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -@@ -5036,7 +5042,7 @@ +@@ -5554,7 +5560,7 @@ _LT_EOF _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; @@ -1418,7 +1393,7 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -6045,7 +6051,7 @@ +@@ -6629,7 +6635,7 @@ if test yes != "$_lt_caught_CXX_error"; esac ;; @@ -1427,7 +1402,7 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 case $GXX,$cc_basename in ,cl* | no,cl*) # Native MSVC -@@ -7779,7 +7785,7 @@ +@@ -8317,7 +8323,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd, *-*-mingw* ) # actually msys lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ;; @@ -1436,7 +1411,7 @@ diff -Naur libiconv-1.14/m4/libtool.m4 libiconv-1.14-m/m4/libtool.m4 lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ;; * ) # otherwise, assume *nix -@@ -7787,12 +7793,12 @@ +@@ -8325,12 +8331,12 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd, ;; esac ;; @@ -1463,10 +1438,10 @@ diff -Naur libiconv-1.14/m4/ltoptions.m4 libiconv-1.14-m/m4/ltoptions.m4 AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) -diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure ---- libiconv-1.14/preload/configure 2010-09-24 03:33:42 +0400 -+++ libiconv-1.14-m/preload/configure 2013-02-12 09:38:12 +0400 -@@ -4303,7 +4303,7 @@ +diff -Naur libiconv-1.15/preload/configure.orig libiconv-1.15/preload/configure +--- libiconv-1.15/preload/configure.orig 2017-01-01 18:03:35.000000000 -0500 ++++ libiconv-1.15/preload/configure 2018-05-01 17:37:18.087367400 -0400 +@@ -4380,7 +4380,7 @@ else lt_cv_sys_max_cmd_len=-1; ;; @@ -1475,7 +1450,7 @@ diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -4487,7 +4487,7 @@ +@@ -4546,7 +4546,7 @@ else *-*-mingw* ) # actually msys lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ;; @@ -1484,7 +1459,7 @@ diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ;; * ) # otherwise, assume *nix -@@ -4495,12 +4495,12 @@ +@@ -4554,12 +4554,12 @@ else ;; esac ;; @@ -1499,16 +1474,16 @@ diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure lt_cv_to_host_file_cmd=func_convert_file_noop ;; * ) # otherwise, assume *nix -@@ -4566,7 +4566,7 @@ +@@ -4625,7 +4625,7 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | msys* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi -@@ -4721,7 +4721,7 @@ +@@ -4780,7 +4780,7 @@ bsdi[45]*) lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -1517,16 +1492,16 @@ diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' -@@ -5039,7 +5039,7 @@ +@@ -5096,7 +5096,7 @@ else lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | msys* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in -@@ -5573,7 +5573,7 @@ +@@ -5630,7 +5630,7 @@ case $host_os in aix*) symcode='[BCDT]' ;; @@ -1535,7 +1510,7 @@ diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure symcode='[ABCDGISTW]' ;; hpux*) -@@ -6811,7 +6811,7 @@ +@@ -7107,7 +7107,7 @@ done enable_win32_dll=yes case $host in @@ -1544,7 +1519,7 @@ diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 -@@ -7651,7 +7651,7 @@ +@@ -8010,7 +8010,7 @@ lt_prog_compiler_static= # PIC is the default for these OSes. ;; @@ -1553,8 +1528,8 @@ diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -7733,7 +7733,7 @@ - fi +@@ -8113,7 +8113,7 @@ lt_prog_compiler_static= + esac ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) @@ -1562,7 +1537,7 @@ diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' -@@ -8210,7 +8210,7 @@ +@@ -8615,7 +8615,7 @@ $as_echo_n "checking whether the $compil extract_expsyms_cmds= case $host_os in @@ -1571,7 +1546,7 @@ diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. -@@ -8325,7 +8325,7 @@ +@@ -8730,7 +8730,7 @@ _LT_EOF fi ;; @@ -1580,7 +1555,7 @@ diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' -@@ -8783,7 +8783,7 @@ +@@ -9270,7 +9270,7 @@ fi export_dynamic_flag_spec=-rdynamic ;; @@ -1589,16 +1564,16 @@ diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -9744,7 +9744,7 @@ +@@ -10305,7 +10305,7 @@ bsdi[45]*) # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | msys* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no -@@ -9776,6 +9776,12 @@ +@@ -10337,6 +10337,12 @@ cygwin* | mingw* | pw32* | cegcc*) sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; @@ -1610,8 +1585,8 @@ diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure + ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -9810,7 +9816,7 @@ + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' +@@ -10371,7 +10377,7 @@ cygwin* | mingw* | pw32* | cegcc*) # Convert to MSYS style. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; @@ -1620,13 +1595,13 @@ diff -Naur libiconv-1.14/preload/configure libiconv-1.14-m/preload/configure # Convert to unix form, then to dos form, then back to unix form # but this time dos style (no spaces!) so that the unix form looks # like /cygdrive/c/PROGRA~1:/cygdr... -@@ -10469,7 +10475,7 @@ - lt_cv_dlopen_self=yes +@@ -11073,7 +11079,7 @@ else + lt_cv_dlopen_libs= ;; -- mingw* | pw32* | cegcc*) -+ mingw* | msys* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" +- cygwin*) ++ cygwin* | msys*) + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; diff -Naur libiconv-1.14/preload/configure.ac libiconv-1.14-m/preload/configure.ac