From 030f4e535a7c88bb310f9a977e486e32fe6fc758 Mon Sep 17 00:00:00 2001 From: Alexpux Date: Sun, 16 Feb 2014 16:59:42 +0400 Subject: [PATCH] file: Update to 5.17 --- file/PKGBUILD | 10 +- ...5.15-msys2.patch => file-5.17-msys2.patch} | 386 ++++++++++-------- 2 files changed, 230 insertions(+), 166 deletions(-) rename file/{file-5.15-msys2.patch => file-5.17-msys2.patch} (63%) diff --git a/file/PKGBUILD b/file/PKGBUILD index c9387d67..198009e8 100644 --- a/file/PKGBUILD +++ b/file/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=file -pkgver=5.16 +pkgver=5.17 pkgrel=1 pkgdesc="File type identification utility" arch=('i686' 'x86_64') @@ -12,15 +12,15 @@ depends=('zlib') makedepends=('python2' 'python3' 'zlib-devel') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.15-msys2.patch + file-5.17-msys2.patch file-5.15-fix-regexp.patch) -md5sums=('359c0cf41c3d438d17b4d293f3b950dc' - '2c18071e10474583c1bd83c28e73442e' +md5sums=('e19c47e069ced7b01ccb4db402cc01d3' + '1538c425504bce1cd01126a385b70eb1' 'f29d52a9c614967b5f3c7d67f0983103') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ${srcdir}/file-5.15-msys2.patch + patch -p1 -i ${srcdir}/file-5.17-msys2.patch patch -p1 -i ${srcdir}/file-5.15-fix-regexp.patch autoreconf -fi diff --git a/file/file-5.15-msys2.patch b/file/file-5.17-msys2.patch similarity index 63% rename from file/file-5.15-msys2.patch rename to file/file-5.17-msys2.patch index 6e026319..8bc83813 100644 --- a/file/file-5.15-msys2.patch +++ b/file/file-5.17-msys2.patch @@ -1,17 +1,7 @@ -diff -Naur file-5.15-orig/config.guess file-5.15/config.guess ---- file-5.15-orig/config.guess 2013-09-24 19:22:11.000000000 +0400 -+++ file-5.15/config.guess 2013-10-02 10:21:30.989200000 +0400 -@@ -801,6 +801,9 @@ - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -@@ -841,6 +844,9 @@ +diff -Naur file-5.17/config.guess file-5.17-msys2/config.guess +--- file-5.17/config.guess 2014-02-13 03:29:38.000000000 +0400 ++++ file-5.17-msys2/config.guess 2014-02-16 13:26:11.040000000 +0400 +@@ -844,6 +844,9 @@ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; @@ -21,22 +11,10 @@ diff -Naur file-5.15-orig/config.guess file-5.15/config.guess p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit ;; -diff -Naur file-5.15-orig/config.sub file-5.15/config.sub ---- file-5.15-orig/config.sub 2013-09-24 19:22:11.000000000 +0400 -+++ file-5.15/config.sub 2013-10-02 10:21:30.989200000 +0400 -@@ -1294,7 +1294,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 file-5.15-orig/configure file-5.15/configure ---- file-5.15-orig/configure 2013-09-24 19:22:10.000000000 +0400 -+++ file-5.15/configure 2013-10-02 10:21:31.004800000 +0400 -@@ -5937,7 +5937,7 @@ +diff -Naur file-5.17/configure file-5.17-msys2/configure +--- file-5.17/configure 2014-02-13 03:29:37.000000000 +0400 ++++ file-5.17-msys2/configure 2014-02-16 13:55:53.784800000 +0400 +@@ -5971,7 +5971,7 @@ lt_cv_sys_max_cmd_len=-1; ;; @@ -45,7 +23,40 @@ diff -Naur file-5.15-orig/configure file-5.15/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, -@@ -6274,7 +6274,7 @@ +@@ -6160,7 +6160,7 @@ + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; +- *-*-cygwin* ) ++ *-*-cygwin* | *-*-msys* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix +@@ -6168,12 +6168,12 @@ + ;; + esac + ;; +- *-*-cygwin* ) ++ *-*-cygwin* | *-*-msys* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; +- *-*-cygwin* ) ++ *-*-cygwin* | *-*-msys* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix +@@ -6239,7 +6239,7 @@ + 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 + reload_cmds=false + fi +@@ -6397,7 +6397,7 @@ lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -54,7 +65,16 @@ diff -Naur file-5.15-orig/configure file-5.15/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' -@@ -6837,7 +6837,7 @@ +@@ -6718,7 +6718,7 @@ + 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 + case `$DLLTOOL --help 2>&1` in +@@ -7210,7 +7210,7 @@ aix*) symcode='[BCDT]' ;; @@ -63,7 +83,7 @@ diff -Naur file-5.15-orig/configure file-5.15/configure symcode='[ABCDGISTW]' ;; hpux*) -@@ -8428,7 +8428,7 @@ +@@ -9031,7 +9031,7 @@ # PIC is the default for these OSes. ;; @@ -72,7 +92,7 @@ diff -Naur file-5.15-orig/configure file-5.15/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 -@@ -8497,7 +8497,7 @@ +@@ -9115,7 +9115,7 @@ fi ;; @@ -81,7 +101,7 @@ diff -Naur file-5.15-orig/configure file-5.15/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' -@@ -8959,7 +8959,7 @@ +@@ -9606,7 +9606,7 @@ extract_expsyms_cmds= case $host_os in @@ -90,7 +110,7 @@ diff -Naur file-5.15-orig/configure file-5.15/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++. -@@ -9046,7 +9046,7 @@ +@@ -9721,7 +9721,7 @@ fi ;; @@ -99,7 +119,7 @@ diff -Naur file-5.15-orig/configure file-5.15/configure # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' -@@ -9459,7 +9459,7 @@ +@@ -10178,7 +10178,7 @@ export_dynamic_flag_spec=-rdynamic ;; @@ -108,7 +128,7 @@ diff -Naur file-5.15-orig/configure file-5.15/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 -@@ -10302,14 +10302,14 @@ +@@ -11131,7 +11131,7 @@ # libtool to hard-code these into programs ;; @@ -117,17 +137,9 @@ diff -Naur file-5.15-orig/configure file-5.15/configure version_type=windows shrext_cmds=".dll" need_version=no - need_lib_prefix=no +@@ -11163,6 +11163,11 @@ - case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10332,6 +10332,11 @@ - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; + msys*) + # MSys DLLs use 'msys-' prefix rather than 'lib' @@ -137,7 +149,16 @@ diff -Naur file-5.15-orig/configure file-5.15/configure mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -10955,7 +10960,7 @@ +@@ -11197,7 +11202,7 @@ + # 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|^ ||'` + ;; +- cygwin*) ++ cygwin* | msys*) + # 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... +@@ -11858,7 +11863,7 @@ lt_cv_dlopen_libs= ;; @@ -146,11 +167,11 @@ diff -Naur file-5.15-orig/configure file-5.15/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs= ;; -diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh ---- file-5.15-orig/ltmain.sh 2013-09-24 19:22:05.000000000 +0400 -+++ file-5.15/ltmain.sh 2013-10-02 10:21:31.566400000 +0400 -@@ -805,7 +805,7 @@ - +diff -Naur file-5.17/ltmain.sh file-5.17-msys2/ltmain.sh +--- file-5.17/ltmain.sh 2014-02-13 03:29:34.000000000 +0400 ++++ file-5.17-msys2/ltmain.sh 2014-02-16 13:29:06.056400000 +0400 +@@ -1181,7 +1181,7 @@ + test "$opt_debug" = : || func_append preserve_args " --debug" case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -158,7 +179,7 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh # don't eliminate duplications in $postdeps and $predeps opt_duplicate_compiler_generated_deps=: ;; -@@ -1276,7 +1276,7 @@ +@@ -2124,7 +2124,7 @@ # On Cygwin there's no "real" PIC flag so we must build both object types case $host_os in @@ -167,7 +188,7 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh pic_mode=default ;; esac -@@ -2047,7 +2047,7 @@ +@@ -2993,7 +2993,7 @@ 'exit $?' tstripme="$stripme" case $host_os in @@ -176,7 +197,7 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh case $realname in *.dll.a) tstripme="" -@@ -2153,7 +2153,7 @@ +@@ -3099,7 +3099,7 @@ # Do a test to see if this is really a libtool program. case $host in @@ -185,7 +206,7 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh if func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" wrapper=$func_ltwrapper_scriptname_result -@@ -2228,7 +2228,7 @@ +@@ -3174,7 +3174,7 @@ # remove .exe since cygwin /usr/bin/install will append another # one anyway case $install_prog,$host in @@ -194,7 +215,7 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh case $file:$destfile in *.exe:*.exe) # this is ok -@@ -2359,7 +2359,7 @@ +@@ -3324,7 +3324,7 @@ $RM $export_symbols eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in @@ -203,52 +224,34 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ;; -@@ -2371,7 +2371,7 @@ +@@ -3336,7 +3336,7 @@ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in -- *cygwin | *mingw* | *cegcc* ) -+ *cygwin | *msys | *mingw* | *cegcc* ) +- *cygwin* | *mingw* | *cegcc* ) ++ *cygwin* | *msys* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; -@@ -2427,7 +2427,7 @@ - } lt_dlsymlist; - " - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - $ECHO >> "$output_objdir/$my_dlsyms" "\ - /* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation -@@ -2513,7 +2513,7 @@ +@@ -3350,7 +3350,7 @@ + func_basename "$dlprefile" + 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" +@@ -3503,7 +3503,7 @@ # Transform the symbol file into the correct name. 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 "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -@@ -2991,7 +2991,7 @@ - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; -- *cygwin* ) -+ *cygwin* | *msys* ) - func_to_host_path_tmp1=`cygpath -w "$1"` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` -@@ -3070,7 +3070,7 @@ - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; -- *cygwin* ) -+ *cygwin* | *msys* ) - func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` -@@ -3384,7 +3384,7 @@ + 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%"` +@@ -4376,7 +4376,7 @@ { EOF case "$host" in @@ -257,7 +260,7 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh # make stdout use "unix" line endings echo " setmode(1,_O_BINARY);" ;; -@@ -4033,7 +4033,7 @@ +@@ -5095,7 +5095,7 @@ { $opt_debug case $host in @@ -266,16 +269,16 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh # 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 -@@ -4502,7 +4502,7 @@ +@@ -5582,7 +5582,7 @@ ;; esac case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; -@@ -4522,7 +4522,7 @@ +@@ -5602,7 +5602,7 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in @@ -284,7 +287,7 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh # These systems don't actually have a C or math library (as such) continue ;; -@@ -4599,7 +4599,7 @@ +@@ -5680,7 +5680,7 @@ -no-install) case $host in @@ -293,16 +296,25 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh # 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" -@@ -5556,7 +5556,7 @@ +@@ -6546,7 +6546,7 @@ + fi + 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 +@@ -6690,7 +6690,7 @@ if test -n "$library_names" && { test "$use_static_libs" = no || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *msys* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded - notinst_deplibs="$notinst_deplibs $lib" + func_append notinst_deplibs " $lib" need_relink=no -@@ -5626,7 +5626,7 @@ +@@ -6760,7 +6760,7 @@ elif test -n "$soname_spec"; then # bleh windows case $host in @@ -311,7 +323,7 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh func_arith $current - $age major=$func_arith_result versuffix="-$major" -@@ -6480,7 +6480,7 @@ +@@ -7626,7 +7626,7 @@ if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in @@ -320,7 +332,7 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) -@@ -6979,7 +6979,7 @@ +@@ -8143,7 +8143,7 @@ orig_export_symbols= case $host_os in @@ -329,7 +341,7 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh 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 -@@ -7491,7 +7491,7 @@ +@@ -8699,7 +8699,7 @@ prog) case $host in @@ -338,7 +350,7 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ -@@ -7604,7 +7604,7 @@ +@@ -8812,7 +8812,7 @@ esac fi case $host in @@ -347,16 +359,16 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; -@@ -7678,7 +7678,7 @@ - - wrappers_required=yes - case $host in +@@ -8890,7 +8890,7 @@ + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=no + ;; - *cygwin* | *mingw* ) -+ *cygwin* | *msys* | *mingw* ) ++ *cygwin* | *mingw* | *msys* ) if test "$build_libtool_libs" != yes; then wrappers_required=no fi -@@ -7821,14 +7821,14 @@ +@@ -9037,14 +9037,14 @@ esac # test for cygwin because mv fails w/o .exe extensions case $host in @@ -373,19 +385,19 @@ diff -Naur file-5.15-orig/ltmain.sh file-5.15/ltmain.sh func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result -@@ -8127,7 +8127,7 @@ - # place dlname in correct position for cygwin +@@ -9374,7 +9374,7 @@ + # 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) tdlname=../bin/$dlname ;; -+ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $ECHO > $output "\ - # $outputname - a libtool library file -diff -Naur file-5.15-orig/m4/libtool.m4 file-5.15/m4/libtool.m4 ---- file-5.15-orig/m4/libtool.m4 2013-09-24 19:22:05.000000000 +0400 -+++ file-5.15/m4/libtool.m4 2013-10-02 10:21:32.611600000 +0400 -@@ -1516,7 +1516,7 @@ +- *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 +diff -Naur file-5.17/m4/libtool.m4 file-5.17-msys2/m4/libtool.m4 +--- file-5.17/m4/libtool.m4 2014-02-13 03:29:34.000000000 +0400 ++++ file-5.17-msys2/m4/libtool.m4 2014-02-16 13:59:39.772800000 +0400 +@@ -1616,7 +1616,7 @@ lt_cv_sys_max_cmd_len=-1; ;; @@ -394,7 +406,7 @@ diff -Naur file-5.15-orig/m4/libtool.m4 file-5.15/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, -@@ -1743,7 +1743,7 @@ +@@ -1863,7 +1863,7 @@ lt_cv_dlopen_libs= ;; @@ -403,7 +415,7 @@ diff -Naur file-5.15-orig/m4/libtool.m4 file-5.15/m4/libtool.m4 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs= ;; -@@ -2200,14 +2200,14 @@ +@@ -2334,7 +2334,7 @@ # libtool to hard-code these into programs ;; @@ -412,17 +424,9 @@ diff -Naur file-5.15-orig/m4/libtool.m4 file-5.15/m4/libtool.m4 version_type=windows shrext_cmds=".dll" need_version=no - need_lib_prefix=no - - case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -2230,6 +2230,11 @@ - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +@@ -2366,6 +2366,11 @@ + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; + msys*) + # MSYS DLLs use 'msys-' prefix rather than 'lib' @@ -432,7 +436,25 @@ diff -Naur file-5.15-orig/m4/libtool.m4 file-5.15/m4/libtool.m4 mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -@@ -2989,7 +2994,7 @@ +@@ -2400,7 +2405,7 @@ + # 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|^ ||'` + ;; +- cygwin*) ++ cygwin* | msys*) + # 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... +@@ -3140,7 +3145,7 @@ + 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 + reload_cmds=false + fi +@@ -3196,7 +3201,7 @@ lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -441,16 +463,25 @@ diff -Naur file-5.15-orig/m4/libtool.m4 file-5.15/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' -@@ -3256,7 +3261,7 @@ +@@ -3506,7 +3511,7 @@ + [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 + case `$DLLTOOL --help 2>&1` in +@@ -3561,7 +3566,7 @@ [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+*-*-beos* | *-*-cygwin* | *-*-msys* | *-*-pw32* | *-*-darwin*) +-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) ++*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*) # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) -@@ -3325,7 +3330,7 @@ +@@ -3636,7 +3641,7 @@ aix*) symcode='[[BCDT]]' ;; @@ -459,7 +490,7 @@ diff -Naur file-5.15-orig/m4/libtool.m4 file-5.15/m4/libtool.m4 symcode='[[ABCDGISTW]]' ;; hpux*) -@@ -3571,7 +3576,7 @@ +@@ -3904,7 +3909,7 @@ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; @@ -468,7 +499,16 @@ diff -Naur file-5.15-orig/m4/libtool.m4 file-5.15/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 -@@ -3878,7 +3883,7 @@ +@@ -3975,7 +3980,7 @@ + ;; + esac + ;; +- mingw* | cygwin* | os2* | pw32* | cegcc*) ++ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*) + # 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], [], +@@ -4222,7 +4227,7 @@ # PIC is the default for these OSes. ;; @@ -477,7 +517,7 @@ diff -Naur file-5.15-orig/m4/libtool.m4 file-5.15/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 -@@ -3948,7 +3953,7 @@ +@@ -4307,7 +4312,7 @@ fi ;; @@ -486,16 +526,16 @@ diff -Naur file-5.15-orig/m4/libtool.m4 file-5.15/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], [], -@@ -4179,7 +4184,7 @@ +@@ -4567,7 +4572,7 @@ pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; + ;; - cygwin* | mingw* | cegcc*) + cygwin* | msys* | mingw* | cegcc*) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; - *) -@@ -4231,7 +4236,7 @@ + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' +@@ -4625,7 +4630,7 @@ extract_expsyms_cmds= case $host_os in @@ -504,7 +544,7 @@ diff -Naur file-5.15-orig/m4/libtool.m4 file-5.15/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++. -@@ -4318,7 +4323,7 @@ +@@ -4740,7 +4745,7 @@ fi ;; @@ -513,7 +553,7 @@ diff -Naur file-5.15-orig/m4/libtool.m4 file-5.15/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' -@@ -4673,7 +4678,7 @@ +@@ -5113,7 +5118,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; @@ -522,24 +562,48 @@ diff -Naur file-5.15-orig/m4/libtool.m4 file-5.15/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 -@@ -5621,7 +5626,7 @@ +@@ -6114,7 +6119,7 @@ esac ;; - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | msys* | mingw* | pw32* | cegcc*) - # _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' -diff -Naur file-5.15-orig/m4/ltoptions.m4 file-5.15/m4/ltoptions.m4 ---- file-5.15-orig/m4/ltoptions.m4 2013-09-24 19:22:05.000000000 +0400 -+++ file-5.15/m4/ltoptions.m4 2013-10-02 10:21:33.407200000 +0400 -@@ -125,7 +125,7 @@ + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC +@@ -7930,7 +7935,7 @@ + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; +- *-*-cygwin* ) ++ *-*-cygwin* | *-*-msys* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix +@@ -7938,12 +7943,12 @@ + ;; + esac + ;; +- *-*-cygwin* ) ++ *-*-cygwin* | *-*-msys* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; +- *-*-cygwin* ) ++ *-*-cygwin* | *-*-msys* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix +diff -Naur file-5.17/m4/ltoptions.m4 file-5.17-msys2/m4/ltoptions.m4 +--- file-5.17/m4/ltoptions.m4 2014-02-13 03:29:34.000000000 +0400 ++++ file-5.17-msys2/m4/ltoptions.m4 2014-02-16 13:57:06.690000000 +0400 +@@ -126,7 +126,7 @@ [enable_win32_dll=yes case $host in --*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) -+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-cegcc*) +-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) ++*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false)