python2: Update to 2.7.9

2014-12-12 15:54:29 +03:00
parent 815a3aca7e
commit 1c379c65d3
3 changed files with 176 additions and 368 deletions
--- a/python2/0110-export-PyNode_SizeOf.patch
+++ b/python2/0110-export-PyNode_SizeOf.patch
@@ -1,12 +0,0 @@
-diff -Naur a/Include/node.h b/Include/node.h
--- a/Include/node.h	2014-05-31 22:58:38.000000000 +0400
-+++ b/Include/node.h	2014-06-04 10:16:57.535000000 +0400
-@@ -21,7 +21,7 @@
-                                       char *str, int lineno, int col_offset);
- PyAPI_FUNC(void) PyNode_Free(node *n);
- #ifndef Py_LIMITED_API
-Py_ssize_t _PyNode_SizeOf(node *n);
-+PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n);
- #endif
- 
- /* Node access functions */
--- a/python2/0200-msys2.patch
+++ b/python2/0200-msys2.patch
@@ -557,7 +557,7 @@ diff -Naur a/Modules/_ctypes/libffi/config.guess b/Modules/_ctypes/libffi/config
 diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
 --- a/Modules/_ctypes/libffi/configure	2014-05-31 22:58:40.000000000 +0400
 +++ b/Modules/_ctypes/libffi/configure	2014-06-04 10:17:02.371000000 +0400
-@@ -5291,7 +5291,7 @@
+@@ -5876,7 +5876,7 @@
     lt_cv_sys_max_cmd_len=-1;
     ;;
 
@@ -566,7 +566,7 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/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,
-@@ -5481,7 +5481,7 @@
+@@ -6042,7 +6042,7 @@
       *-*-mingw* ) # actually msys
         lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
         ;;
@@ -575,7 +575,7 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
         lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
         ;;
       * ) # otherwise, assume *nix
-@@ -5489,12 +5489,12 @@
+@@ -6050,12 +6050,12 @@
         ;;
     esac
     ;;
@@ -590,16 +590,16 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
         lt_cv_to_host_file_cmd=func_convert_file_noop
         ;;
       * ) # otherwise, assume *nix
-@@ -5560,7 +5560,7 @@
+@@ -6121,7 +6121,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
+     if test yes != "$GCC"; then
       reload_cmds=false
     fi
-@@ -5718,7 +5718,7 @@
+@@ -6279,7 +6279,7 @@
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
@@ -608,16 +608,16 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/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'
-@@ -6039,7 +6039,7 @@
+@@ -6595,7 +6595,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
+   # two different shell functions defined in ltmain.sh;
+   # decide which one to use based on capabilities of $DLLTOOL
   case `$DLLTOOL --help 2>&1` in
-@@ -6532,7 +6532,7 @@
+@@ -7088,7 +7088,7 @@
 aix*)
   symcode='[BCDT]'
   ;;
@@ -626,7 +626,7 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
   symcode='[ABCDGISTW]'
   ;;
 hpux*)
-@@ -8629,7 +8629,7 @@
+@@ -9288,7 +9288,7 @@
       # PIC is the default for these OSes.
       ;;
 
@@ -635,8 +635,8 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/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
-@@ -8713,7 +8713,7 @@
-       fi
+@@ -9386,7 +9386,7 @@
+       esac
       ;;
 
 -    mingw* | cygwin* | pw32* | os2* | cegcc*)
@@ -644,7 +644,7 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/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'
-@@ -9204,7 +9204,7 @@
+@@ -9883,7 +9883,7 @@
   extract_expsyms_cmds=
 
   case $host_os in
@@ -653,7 +653,7 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/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++.
-@@ -9319,7 +9319,7 @@
+@@ -9998,7 +9998,7 @@
       fi
       ;;
 
@@ -662,7 +662,7 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
-@@ -9776,7 +9776,7 @@
+@@ -10457,7 +10457,7 @@
       export_dynamic_flag_spec=-rdynamic
       ;;
 
@@ -671,16 +671,16 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/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
-@@ -10729,7 +10729,7 @@
+@@ -11410,7 +11410,7 @@
   # 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
-@@ -10761,6 +10761,12 @@
+@@ -11442,6 +11442,12 @@
 
       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
@@ -692,8 +692,8 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
 +      ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-@@ -10795,7 +10801,7 @@
+       soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+@@ -11476,7 +11482,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|^ ||'`
       ;;
@@ -702,16 +702,55 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/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...
-@@ -11460,7 +11466,7 @@
+@@ -12135,7 +12141,7 @@
     lt_cv_dlopen_libs=
     ;;
 
 -  cygwin*)
 +  cygwin* | msys*)
-     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen=dlopen
     lt_cv_dlopen_libs=
     ;;
-@@ -13193,7 +13199,7 @@
+@@ -13392,7 +13398,7 @@
+         esac
+         ;;
+ 
+-      cygwin* | mingw* | pw32* | cegcc*)
+      cygwin* | msys* | mingw* | pw32* | cegcc*)
+ 	case $GXX,$cc_basename in
+ 	,cl* | no,cl*)
+ 	  # Native MSVC
+@@ -14974,7 +14980,7 @@
+   pw32*)
+     export_symbols_cmds_CXX=$ltdll_cmds
+     ;;
+-  cygwin* | mingw* | cegcc*)
+  cygwin* | msys* | mingw* | cegcc*)
+     case $cc_basename in
+     cl*)
+       exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+@@ -15243,7 +15249,7 @@
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=.dll
+   need_version=no
+@@ -15274,6 +15280,11 @@
+       soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ 
+       ;;
+    msys*)
+      # MSYS DLLs use 'msys-' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
+      ;;
+     mingw* | cegcc*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+@@ -17056,7 +17067,7 @@
    # Systems known to be in this category are Windows (all variants),
    # VMS, and Darwin.
    case "$host_os" in
@@ -720,7 +759,7 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
 	ac_cv_func_mmap_dev_zero=no ;;
      *)
 	ac_cv_func_mmap_dev_zero=yes;;
-@@ -13250,7 +13256,7 @@
+@@ -17113,7 +17124,7 @@
    # above for use of /dev/zero.
    # Systems known to be in this category are Windows, VMS, and SCO Unix.
    case "$host_os" in
@@ -729,7 +768,7 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
 	ac_cv_func_mmap_anon=no ;;
      *)
 	ac_cv_func_mmap_anon=yes;;
-@@ -13344,7 +13350,7 @@
+@@ -17212,7 +17223,7 @@
   i?86-*-freebsd* | i?86-*-openbsd*)
 	TARGET=X86_FREEBSD; TARGETDIR=x86
 	;;
@@ -738,7 +777,7 @@ diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
 	TARGET=X86_WIN32; TARGETDIR=x86
 	# All mingw/cygwin/win32 builds require -no-undefined for sharedlib.
 	# We must also check with_cross_host to decide if this is a native
-@@ -13376,7 +13382,7 @@
+@@ -17244,7 +17255,7 @@
 	TARGET=X86_DARWIN; TARGETDIR=x86
 	;;
 
@@ -771,16 +810,16 @@ diff -Naur a/Modules/_ctypes/libffi/configure.ac b/Modules/_ctypes/libffi/config
 diff -Naur a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
 --- a/Modules/_ctypes/libffi/ltmain.sh	2014-05-31 22:58:40.000000000 +0400
 +++ b/Modules/_ctypes/libffi/ltmain.sh	2014-06-04 10:17:02.402200000 +0400
-@@ -1180,7 +1180,7 @@
-   test "$opt_debug" = : || func_append preserve_args " --debug"
+@@ -2315,7 +2315,7 @@
+     test : = "$debug_cmd" || 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=:
-       ;;
-@@ -2123,7 +2123,7 @@
+     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=:
+         ;;
+@@ -3328,7 +3328,7 @@
 
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
@@ -789,16 +828,16 @@ diff -Naur a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
       pic_mode=default
       ;;
     esac
-@@ -2992,7 +2992,7 @@
+@@ -4201,7 +4201,7 @@
 	      'exit $?'
- 	  tstripme="$stripme"
+ 	  tstripme=$stripme
 	  case $host_os in
 -	  cygwin* | mingw* | pw32* | cegcc*)
 +	  cygwin* | msys* | mingw* | pw32* | cegcc*)
 	    case $realname in
 	    *.dll.a)
- 	      tstripme=""
-@@ -3098,7 +3098,7 @@
+ 	      tstripme=
+@@ -4307,7 +4307,7 @@
 
 	# Do a test to see if this is really a libtool program.
 	case $host in
@@ -807,7 +846,7 @@ diff -Naur a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
 	    if func_ltwrapper_executable_p "$file"; then
 	      func_ltwrapper_scriptname "$file"
 	      wrapper=$func_ltwrapper_scriptname_result
-@@ -3173,7 +3173,7 @@
+@@ -4382,7 +4382,7 @@
 	# remove .exe since cygwin /usr/bin/install will append another
 	# one anyway
 	case $install_prog,$host in
@@ -816,16 +855,16 @@ diff -Naur a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
 	  case $file:$destfile in
 	  *.exe:*.exe)
 	    # this is ok
-@@ -3323,7 +3323,7 @@
+@@ -4535,7 +4535,7 @@
 	      $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"'
 	        ;;
-@@ -3335,7 +3335,7 @@
+@@ -4547,7 +4547,7 @@
 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
@@ -834,43 +873,43 @@ diff -Naur a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
 	          ;;
-@@ -3349,7 +3349,7 @@
+@@ -4561,7 +4561,7 @@
 	  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"
-@@ -3502,7 +3502,7 @@
+@@ -4736,7 +4736,7 @@
 	# 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%"`
-@@ -4375,7 +4375,7 @@
+@@ -5629,7 +5629,7 @@
 	{
 EOF
- 	    case "$host" in
+ 	    case $host in
 -	      *mingw* | *cygwin* )
 +	      *mingw* | *cygwin* | *msys* )
 		# make stdout use "unix" line endings
 		echo "          setmode(1,_O_BINARY);"
 		;;
-@@ -5094,7 +5094,7 @@
- {
-     $opt_debug
+@@ -6350,7 +6350,7 @@
+     $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
-@@ -5581,7 +5581,7 @@
+       # what system we are compiling for in order to pass an extra
+@@ -6843,7 +6843,7 @@
 	  ;;
 	esac
 	case $host in
@@ -879,16 +918,16 @@ diff -Naur a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
 	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
-@@ -5601,7 +5601,7 @@
+@@ -6863,7 +6863,7 @@
       -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
 	    ;;
-@@ -5679,7 +5679,7 @@
+@@ -6946,7 +6946,7 @@
 
       -no-install)
 	case $host in
@@ -896,26 +935,26 @@ diff -Naur a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/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"
-@@ -6545,7 +6545,7 @@
+ 	  func_warning "'-no-install' is ignored for $host"
+@@ -7812,7 +7812,7 @@
 	  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
-@@ -6689,7 +6689,7 @@
+@@ -7956,7 +7956,7 @@
 	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*)
 	      # No point in relinking DLLs because paths are not encoded
 	      func_append notinst_deplibs " $lib"
 	      need_relink=no
-@@ -6759,7 +6759,7 @@
+@@ -8026,7 +8026,7 @@
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
@@ -923,9 +962,9 @@ diff -Naur a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
 +	      *cygwin* | *msys* | mingw* | *cegcc*)
 	        func_arith $current - $age
 		major=$func_arith_result
- 		versuffix="-$major"
-@@ -7620,7 +7620,7 @@
-       if test "$build_libtool_libs" = yes; then
+ 		versuffix=-$major
+@@ -8899,7 +8899,7 @@
+       if test yes = "$build_libtool_libs"; then
 	if test -n "$rpath"; then
 	  case $host in
 -	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -933,7 +972,7 @@ diff -Naur a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
 	    # these systems don't actually have a c library (as such)!
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
-@@ -8134,7 +8134,7 @@
+@@ -9413,7 +9413,7 @@
 
 	orig_export_symbols=
 	case $host_os in
@@ -941,8 +980,8 @@ diff -Naur a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/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
-@@ -8690,7 +8690,7 @@
+ 	    func_dll_def_p "$export_symbols" || {
+@@ -9970,7 +9970,7 @@
 
     prog)
       case $host in
@@ -951,25 +990,25 @@ diff -Naur a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
 	          output=$func_stripname_result.exe;;
       esac
       test -n "$vinfo" && \
-@@ -8803,7 +8803,7 @@
+@@ -10081,7 +10081,7 @@
 	  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:"*) ;;
-@@ -8881,7 +8881,7 @@
+@@ -10159,7 +10159,7 @@
         # 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
-@@ -9028,14 +9028,14 @@
+         test yes = "$build_libtool_libs" || wrappers_required=false
+         ;;
+       *)
+@@ -10305,14 +10305,14 @@
 	esac
 	# test for cygwin because mv fails w/o .exe extensions
 	case $host in
@@ -986,19 +1025,19 @@ diff -Naur a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
 	    func_dirname_and_basename "$output" "" "."
 	    output_name=$func_basename_result
 	    output_path=$func_dirname_result
-@@ -9365,7 +9365,7 @@
+@@ -10644,7 +10644,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)
 +	    *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 a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/libtool.m4
 --- a/Modules/_ctypes/libffi/m4/libtool.m4	2014-05-31 22:58:40.000000000 +0400
 +++ b/Modules/_ctypes/libffi/m4/libtool.m4	2014-06-04 10:17:02.417800000 +0400
-@@ -1623,7 +1623,7 @@
+@@ -1665,7 +1665,7 @@
     lt_cv_sys_max_cmd_len=-1;
     ;;
 
@@ -1007,25 +1046,25 @@ diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/li
     # 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,
-@@ -1871,7 +1871,7 @@
+@@ -1913,7 +1913,7 @@
     lt_cv_dlopen_libs=
     ;;
 
 -  cygwin*)
 +  cygwin* | msys*)
-     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen=dlopen
     lt_cv_dlopen_libs=
     ;;
-@@ -2342,7 +2342,7 @@
+@@ -2399,7 +2399,7 @@
   # 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
-@@ -2374,6 +2374,12 @@
+@@ -2431,6 +2431,12 @@
 m4_if([$1], [],[
       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
       ;;
@@ -1037,17 +1076,26 @@ diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/li
 +      ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-@@ -3152,7 +3158,7 @@
+       soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+@@ -2465,7 +2471,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...
+@@ -3203,7 +3209,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
+     if test yes != "$GCC"; then
       reload_cmds=false
     fi
-@@ -3208,7 +3214,7 @@
+@@ -3259,7 +3265,7 @@
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
@@ -1056,16 +1104,25 @@ diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/li
   # 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'
-@@ -3518,7 +3524,7 @@
+@@ -3564,7 +3570,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
+   # two different shell functions defined in ltmain.sh;
+   # decide which one to use based on capabilities of $DLLTOOL
   case `$DLLTOOL --help 2>&1` in
-@@ -3648,7 +3654,7 @@
+@@ -3634,7 +3640,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-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*)
+@@ -3709,7 +3715,7 @@
 aix*)
   symcode='[[BCDT]]'
   ;;
@@ -1074,7 +1131,7 @@ diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/li
   symcode='[[ABCDGISTW]]'
   ;;
 hpux*)
-@@ -3916,7 +3922,7 @@
+@@ -4015,7 +4021,7 @@
     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
@@ -1083,7 +1140,7 @@ diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/li
       # 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
-@@ -3987,7 +3993,7 @@
+@@ -4086,7 +4092,7 @@
 	  ;;
 	esac
 	;;
@@ -1092,7 +1149,7 @@ diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/li
 	# 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], [],
-@@ -4234,7 +4240,7 @@
+@@ -4334,7 +4340,7 @@
       # PIC is the default for these OSes.
       ;;
 
@@ -1101,8 +1158,8 @@ diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/li
       # 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
-@@ -4319,7 +4325,7 @@
-       fi
+@@ -4433,7 +4439,7 @@
+       esac
       ;;
 
 -    mingw* | cygwin* | pw32* | os2* | cegcc*)
@@ -1110,16 +1167,16 @@ diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/li
       # 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], [],
-@@ -4579,7 +4585,7 @@
+@@ -4699,7 +4705,7 @@
   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*)
       _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-@@ -4637,7 +4643,7 @@
+@@ -4757,7 +4763,7 @@
   extract_expsyms_cmds=
 
   case $host_os in
@@ -1128,7 +1185,7 @@ diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/li
     # 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++.
-@@ -4752,7 +4758,7 @@
+@@ -4872,7 +4878,7 @@
       fi
       ;;
 
@@ -1137,7 +1194,7 @@ diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/li
       # _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'
-@@ -5125,7 +5131,7 @@
+@@ -5247,7 +5253,7 @@
       _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
       ;;
 
@@ -1146,7 +1203,7 @@ diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/li
       # When not using gcc, we currently assume that we are using
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -6126,7 +6132,7 @@
+@@ -6241,7 +6247,7 @@
         esac
         ;;
 
@@ -1155,7 +1212,7 @@ diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/li
 	case $GXX,$cc_basename in
 	,cl* | no,cl*)
 	  # Native MSVC
-@@ -7942,7 +7948,7 @@
+@@ -7937,7 +7943,7 @@
       *-*-mingw* ) # actually msys
         lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
         ;;
@@ -1164,7 +1221,7 @@ diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/li
         lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
         ;;
       * ) # otherwise, assume *nix
-@@ -7950,12 +7956,12 @@
+@@ -7945,12 +7951,12 @@
         ;;
     esac
     ;;
@@ -1191,240 +1248,6 @@ diff -Naur a/Modules/_ctypes/libffi/m4/ltoptions.m4 b/Modules/_ctypes/libffi/m4/
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-diff -Naur a/Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp b/Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp
--- a/Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp	2014-06-04 10:17:02.449000000 +0400
-@@ -175,7 +175,7 @@
-   } else {
-     setenv DYLD_LIBRARY_PATH "$ld_library_path"
-   }
-  if { [istarget *-*-cygwin*] || [istarget *-*-mingw*] } {
-+  if { [istarget *-*-cygwin*] || [istarget *-*-mingw*] || [istarget *-*-msys*] } {
-     if { $orig_path_saved } {
-       setenv PATH "$ld_library_path:$orig_path"
-     } else {
-@@ -271,7 +271,7 @@
- 
-     if { [ istarget *-*-darwin* ] } {
- 	set shlib_ext "dylib"
-    } elseif { [ istarget *-*-cygwin* ] || [ istarget *-*-mingw* ] } {
-+    } elseif { [ istarget *-*-cygwin* ] || [ istarget *-*-msys* ] || [ istarget *-*-mingw* ] } {
- 	set shlib_ext "dll"
-     } elseif { [ istarget hppa*-*-hpux* ] } {
- 	set shlib_ext "sl"
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c b/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c	2014-06-04 10:17:02.449000000 +0400
-@@ -4,7 +4,7 @@
-    PR:		none.
-    Originator:	<twalljava@dev.java.net> */
- 
-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
-+/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
- #include "ffitest.h"
- 
- static void
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c b/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c	2014-06-04 10:17:02.449000000 +0400
-@@ -4,7 +4,7 @@
-    PR:		none.
-    Originator:	<ktietz@redhat.com> */
- 
-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
-+/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* i?86-*-msys* } } */
- #include "ffitest.h"
- 
- static void
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split.c b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split.c	2014-06-04 10:17:02.449000000 +0400
-@@ -4,10 +4,10 @@
-    PR:		none.
-    Originator:	<hos@tamanegi.org> 20031203	 */
- 
-/* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
-+/* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
- /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
- /* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */
-/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
-+/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
- 
- #include "ffitest.h"
- 
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c	2014-06-04 10:17:02.464600000 +0400
-@@ -5,10 +5,10 @@
- 	Originator:		Blake Chaffin	6/18/2007
- */
- 
-/* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
-+/* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
- /* { dg-do run { xfail strongarm*-*-* } } */
- /* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */
-/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
-+/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
- 
- #include "ffitest.h"
- 
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c	2014-06-04 10:17:02.464600000 +0400
-@@ -4,12 +4,12 @@
-    PR:			none.
-    Originator:	Blake Chaffin	*/
- 
-/* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
-+/* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
- /* This test is known to PASS on armv7l-unknown-linux-gnueabihf, so I have
-    remove the xfail for arm*-*-* below, until we know more.  */
- /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
- /* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */
-/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
-+/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
- 
- #include "ffitest.h"
- 
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c	2014-06-04 10:17:02.464600000 +0400
-@@ -4,7 +4,7 @@
-    PR:		none.
-    Originator:	From the original ffitest.c  */
- 
-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
-+/* { dg-do run { target i?86-*-cygwin* i?86-*-msys i?86-*-mingw* } } */
- 
- #include "ffitest.h"
- 
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c	2014-06-04 10:17:02.464600000 +0400
-@@ -4,7 +4,7 @@
-    PR:		none.
-    Originator:	From the original ffitest.c  */
- 
-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
-+/* { dg-do run { target i?86-*-cygwin* i?86-*-msys i?86-*-mingw* } } */
- 
- #include "ffitest.h"
- 
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c	2014-06-04 10:17:02.464600000 +0400
-@@ -4,7 +4,7 @@
-    PR:		none.
-    Originator:	From the original ffitest.c  */
- 
-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
-+/* { dg-do run { target i?86-*-cygwin* i?86-*-msys i?86-*-mingw* } } */
- 
- #include "ffitest.h"
- 
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/float2.c b/Modules/_ctypes/libffi/testsuite/libffi.call/float2.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/float2.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/float2.c	2014-06-04 10:17:02.464600000 +0400
-@@ -4,8 +4,8 @@
-    PR:		none.
-    Originator:	From the original ffitest.c  */
- 
-/* { dg-excess-errors "fails" { target x86_64-*-mingw* x86_64-*-cygwin* } } */
-/* { dg-do run { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
-+/* { dg-excess-errors "fails" { target x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
-+/* { dg-do run { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
- 
- #include "ffitest.h"
- #include "float.h"
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c b/Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c	2014-06-04 10:17:02.480200000 +0400
-@@ -5,11 +5,11 @@
- 	Originator:		Blake Chaffin	6/18/2007
- */
- 
-/* { dg-excess-errors "" { target x86_64-*-mingw* x86_64-*-cygwin* } } */
-+/* { dg-excess-errors "" { target x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
- /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
- /* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */
- /* { dg-options -Wformat=0 { target moxie*-*-elf } } */
-/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
-+/* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
- 
- #include "ffitest.h"
- 
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c	2014-06-04 10:17:02.480200000 +0400
-@@ -4,7 +4,7 @@
-    PR:		none.
-    Originator:	From the original ffitest.c  */
- 
-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
-+/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
- 
- #include "ffitest.h"
- #include <float.h>
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c b/Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c	2014-06-04 10:17:02.480200000 +0400
-@@ -4,7 +4,7 @@
-    PR:		none.
-    Originator:	<andreast@gcc.gnu.org> 20071113  */
- 
-/* { dg-do run { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
-+/* { dg-do run { xfail x86_64-*-mingw* x86_64-*-cygwin* x86_64-*-msys* } } */
- #include "ffitest.h"
- 
- static long double return_ldl(long double ldl)
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c	2014-06-04 10:17:02.480200000 +0400
-@@ -4,7 +4,7 @@
-    PR:		none.
-    Originator:	From the original ffitest.c  */
- 
-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
-+/* { dg-do run { target i?86-*-cygwin* i?86-*-msys* i?86-*-mingw* } } */
- 
- #include "ffitest.h"
- 
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c	2014-06-04 10:17:02.480200000 +0400
-@@ -4,7 +4,7 @@
-    PR:		none.
-    Originator:	From the original ffitest.c  */
- 
-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
-+/* { dg-do run { target i?86-*-cygwin* i?86-*-msys i?86-*-mingw* } } */
- 
- #include "ffitest.h"
- 
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c	2014-06-04 10:17:02.480200000 +0400
-@@ -4,7 +4,7 @@
-    PR:		none.
-    Originator:	From the original ffitest.c  */
- 
-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
-+/* { dg-do run { target i?86-*-cygwin* i?86-*-msys i?86-*-mingw* } } */
- #include "ffitest.h"
- 
- typedef struct
-diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c
--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c	2014-05-31 22:58:40.000000000 +0400
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c	2014-06-04 10:17:02.495800000 +0400
-@@ -4,7 +4,7 @@
-    PR:		none.
-    Originator:	From the original ffitest.c  */
- 
-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */
-+/* { dg-do run { target i?86-*-cygwin* i?86-*-msys i?86-*-mingw* } } */
- #include "ffitest.h"
- 
- typedef struct
 diff -Naur a/Modules/makesetup b/Modules/makesetup
 --- a/Modules/makesetup	2014-05-31 22:58:40.000000000 +0400
 +++ b/Modules/makesetup	2014-06-04 10:17:02.495800000 +0400
@@ -1441,14 +1264,14 @@ diff -Naur a/Modules/zlib/configure b/Modules/zlib/configure
 --- a/Modules/zlib/configure	2014-05-31 22:58:40.000000000 +0400
 +++ b/Modules/zlib/configure	2014-06-04 10:17:02.495800000 +0400
@@ -77,7 +77,7 @@
-   CFLAGS="$cflags"
-   case `(uname -s || echo unknown) 2>/dev/null` in
-   Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
-  CYGWIN* | Cygwin* | cygwin* | OS/2* )
+   *BSD | *bsd* | DragonFly)
+         LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"}
+         LDCONFIG="ldconfig -m" ;;
+-  CYGWIN* | Cygwin* | cygwin* | OS/2*)
 +  CYGWIN* | Cygwin* | cygwin* | OS/2* | MSYS* | Msys* )
-              EXE='.exe';;
-   QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
-          # (alain.bonnefoy@icbt.com)
+         EXE='.exe' ;;
+   MINGW* | mingw*)
+ # temporary bypass
 diff -Naur a/setup.py b/setup.py
 --- a/setup.py	2014-06-04 10:16:57.223000000 +0400
 +++ b/setup.py	2014-06-04 10:17:02.511400000 +0400
--- a/python2/PKGBUILD
+++ b/python2/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Ray Donnelly <mingw.android@gmail.com>

 pkgname=python2
-pkgver=2.7.8
-pkgrel=3
+pkgver=2.7.9
+pkgrel=1
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -25,13 +25,12 @@ source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
        0080-dylib.patch
        0090-getpath-exe-extension.patch
        0100-no-libm.patch
-        0110-export-PyNode_SizeOf.patch
        0120-fix-sqlite-module.patch
        0200-msys2.patch
        0210-reorder-bininstall-ln-symlink-creation.patch
        0250-allow-win-drives-in-os-path-isabs.patch
        2.7.5-allow-windows-paths-for-executable.patch)
-sha1sums=('9c6281eeace0c3646fa556c8087bb1b7e033c9c4'
+sha1sums=('3172f6e957713c2d9fca462cc16068222fd1b9d3'
          'ff18e75ffa0351c481ca45065cdcc5cd83857712'
          'eb3a15abc19c26754121b9a8f9e3e49055424e09'
          '53ddc2e463046aed4dfcff42a832a2edceb66867'
@@ -42,9 +41,8 @@ sha1sums=('9c6281eeace0c3646fa556c8087bb1b7e033c9c4'
          'ebc73f45bb01a28519b1a5c9d124a28943724b80'
          '4fd71aac6a4316c9350150dd35d15196ed01efeb'
          '215d3f1e68aaf1c31b8a9f94ed8b2d03d42c4c03'
-          '32f17eb68c83b4a62219421f58c7082673ba2d58'
          'f0a9ff9081bbc3df4eab8a6ec1492b5d537f9ca1'
-          'c7987769cd5c4a9e0487b8288b66fa708a9585c2'
+          'a1806da6956df1860cc23ff3701cd80cbb126b87'
          'e6e13cb541efaaf228355cb1d7d5cd8574757c72'
          '80975639f5ad78fd15b8f81bd98fb460c4ee05c4'
          'fb78069fadcf5394ba380e26e371ad687d344415')
@@ -62,7 +60,6 @@ prepare() {
  patch -p1 -i ${srcdir}/0080-dylib.patch
  patch -p1 -i ${srcdir}/0090-getpath-exe-extension.patch
  patch -p1 -i ${srcdir}/0100-no-libm.patch
-  patch -p1 -i ${srcdir}/0110-export-PyNode_SizeOf.patch
  patch -p1 -i ${srcdir}/0120-fix-sqlite-module.patch
  patch -p1 -i ${srcdir}/0200-msys2.patch
  patch -p1 -i ${srcdir}/0210-reorder-bininstall-ln-symlink-creation.patch