*** ./Modules/ld_so_aix.in	Tue Apr 10 01:07:34 2012
--- ./Modules/ld_so_aix.in	Mon Feb 17 16:41:32 2014
***************
*** 174,182 ****
  else
    CCOPT="-Wl,-bnoentry -Wl,-bE:$expfile -Wl,-bhalt:4"
  fi
! CCOPT="$CCOPT -Wl,-bM:SRE -Wl,-T512 -Wl,-H512 -Wl,-brtl -Wl,-bnortllib -lm -o $objfile"
  
! CCARGS="$args"
  
  # Export list generation.
  #echo $makexp $expfile "$objfile" $objs
--- 174,182 ----
  else
    CCOPT="-Wl,-bnoentry -Wl,-bE:$expfile -Wl,-bhalt:4"
  fi
! CCOPT="$CCOPT -Wl,-bM:SRE -Wl,-T512 -Wl,-H512 -Wl,-brtl -Wl,-bnortllib -o $objfile"
  
! CCARGS="$args -lm"
  
  # Export list generation.
  #echo $makexp $expfile "$objfile" $objs
*** ./Modules/mathmodule.c	Tue Apr 10 01:07:34 2012
--- ./Modules/mathmodule.c	Mon Feb 17 16:41:32 2014
***************
*** 78,84 ****
      /* this function should only ever be called for finite arguments */
      assert(Py_IS_FINITE(x));
      y = fmod(fabs(x), 2.0);
!     n = (int)round(2.0*y);
      assert(0 <= n && n <= 4);
      switch (n) {
      case 0:
--- 80,86 ----
      /* this function should only ever be called for finite arguments */
      assert(Py_IS_FINITE(x));
      y = fmod(fabs(x), 2.0);
!     n = (int)floor(2.0*y + 0.5);
      assert(0 <= n && n <= 4);
      switch (n) {
      case 0:
*** ./configure	Tue Apr 10 01:07:36 2012
--- ./configure	Mon Feb 17 16:43:47 2014
***************
*** 7608,7630 ****
  		LDSHARED="\$(BINLIBDEST)/config/ld_so_beos \$(LIBDIR)/$LDLIBRARY"
  		;;
  	IRIX/5*) LDSHARED="ld -shared";;
! 	IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
  	SunOS/5*)
  		if test "$GCC" = "yes" ; then
! 			LDSHARED='$(CC) -shared'
! 			LDCXXSHARED='$(CXX) -shared'
  		else
  			LDSHARED='$(CC) -G'
  			LDCXXSHARED='$(CXX) -G'
  		fi ;;
  	hp*|HP*)
  		if test "$GCC" = "yes" ; then
! 			LDSHARED='$(CC) -shared'
! 			LDCXXSHARED='$(CXX) -shared'
  		else
  			LDSHARED='ld -b'
  		fi ;;
! 	OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
  	Darwin/1.3*)
  		LDSHARED='$(CC) -bundle'
  		LDCXXSHARED='$(CXX) -bundle'
--- 7602,7624 ----
  		LDSHARED="\$(BINLIBDEST)/config/ld_so_beos \$(LIBDIR)/$LDLIBRARY"
  		;;
  	IRIX/5*) LDSHARED="ld -shared";;
! 	IRIX*/6*) LDSHARED="gcc ${SGI_ABI} -shared -static-libgcc -all";;
  	SunOS/5*)
  		if test "$GCC" = "yes" ; then
! 			LDSHARED='$(CC) -static-libgcc -shared'
! 			LDCXXSHARED='$(CXX) -static-libgcc -shared'
  		else
  			LDSHARED='$(CC) -G'
  			LDCXXSHARED='$(CXX) -G'
  		fi ;;
  	hp*|HP*)
  		if test "$GCC" = "yes" ; then
! 			LDSHARED='$(CC) -static-libgcc -shared'
! 			LDCXXSHARED='$(CXX) -static-libgcc -shared'
  		else
  			LDSHARED='ld -b'
  		fi ;;
! 	OSF*) LDSHARED="gcc -shared -static-libgcc -Wl,-expect_unresolved,\"*\"";;
  	Darwin/1.3*)
  		LDSHARED='$(CC) -bundle'
  		LDCXXSHARED='$(CXX) -bundle'
***************
*** 7834,7839 ****
--- 7828,7839 ----
  		LINKFORSHARED='-Wl,-E -N 2048K';;
  	esac
  fi
+ 
+ case $ac_sys_system in
+       Darwin*) ;;
+             *) LINKFORSHARED="$LINKFORSHARED -static-libgcc";;
+ esac
+ 
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINKFORSHARED" >&5
  $as_echo "$LINKFORSHARED" >&6; }
  
***************
*** 7965,7970 ****
--- 7965,8015 ----
  
  fi
  	# Dynamic linking for HP-UX
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync in -lposix4" >&5
+ $as_echo_n "checking for fdatasync in -lposix4... " >&6; }
+ if test "${ac_cv_lib_posix4_fdatasync+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix4  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char fdatasync ();
+ int
+ main ()
+ {
+ return fdatasync ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_posix4_fdatasync=yes
+ else
+   ac_cv_lib_posix4_fdatasync=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_fdatasync" >&5
+ $as_echo "$ac_cv_lib_posix4_fdatasync" >&6; }
+ if test "x$ac_cv_lib_posix4_fdatasync" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBPOSIX4 1
+ _ACEOF
+ 
+   LIBS="-lposix4 $LIBS"
+ 
+ fi
+  # Dynamic linking for SunOS/Solaris
  
  # only check for sem_init if thread support is requested
  if test "$with_threads" = "yes" -o -z "$with_threads"; then
*** configure.ac	2014-06-30 04:05:48.000000000 +0200
--- configure.ac.diff	2014-08-07 18:25:10.000000000 +0200
***************
*** 2180,2185 ****
--- 2180,2191 ----
  		LINKFORSHARED='-Wl,-E -N 2048K';;
  	esac
  fi
+ 
+ case $ac_sys_system in
+    Darwin*) ;;
+          *) LINKFORSHARED="$LINKFORSHARED -static-libgcc";;
+ esac
+   
  AC_MSG_RESULT($LINKFORSHARED)
  
  
*** ./setup.py	Tue Apr 10 01:07:36 2012
--- ./setup.py	Mon Feb 17 16:41:32 2014
***************
*** 1004,1010 ****
          # We hunt for #define SQLITE_VERSION "n.n.n"
          # We need to find >= sqlite version 3.0.8
          sqlite_incdir = sqlite_libdir = None
!         sqlite_inc_paths = [ '/usr/include',
                               '/usr/include/sqlite',
                               '/usr/include/sqlite3',
                               '/usr/local/include',
--- 1004,1011 ----
          # We hunt for #define SQLITE_VERSION "n.n.n"
          # We need to find >= sqlite version 3.0.8
          sqlite_incdir = sqlite_libdir = None
!         sqlite_inc_paths = [ os.environ.get('WITH_SQLITE_DIR', '/foo') + '/include',
!                              '/usr/include',
                               '/usr/include/sqlite',
                               '/usr/include/sqlite3',
                               '/usr/local/include',
*** setup.py.orig	2014-03-05 16:46:38.000000000 -0500
--- setup.py	2014-03-05 16:46:43.000000000 -0500
***************
*** 756,761 ****
--- 756,763 ----
          have_usable_openssl = (have_any_openssl and
                                 openssl_ver >= min_openssl_ver)
  
+         have_any_openssl = True
+         have_usable_openssl = True
          if have_any_openssl:
              if have_usable_openssl:
                  # The _hashlib module wraps optimized implementations
***************
*** 763,769 ****
                  exts.append( Extension('_hashlib', ['_hashopenssl.c'],
                                         include_dirs = ssl_incs,
                                         library_dirs = ssl_libs,
!                                        libraries = ['ssl', 'crypto']) )
              else:
                  print ("warning: openssl 0x%08x is too old for _hashlib" %
                         openssl_ver)
--- 765,771 ----
                  exts.append( Extension('_hashlib', ['_hashopenssl.c'],
                                         include_dirs = ssl_incs,
                                         library_dirs = ssl_libs,
!                                        libraries = ['crypto']) )
              else:
                  print ("warning: openssl 0x%08x is too old for _hashlib" %
                         openssl_ver)