python3: Rebase patches onto 3.4.2

This commit is contained in:
Ray Donnelly
2014-10-11 14:46:25 +01:00
parent 7ba945ec2c
commit a391fdb04e
85 changed files with 676 additions and 671 deletions

View File

@@ -1,7 +1,7 @@
diff -Naur a/configure.ac b/configure.ac
--- a/configure.ac 2014-05-20 00:55:07.732000000 +0400
+++ b/configure.ac 2014-05-20 00:55:08.122000000 +0400
@@ -2074,6 +2074,9 @@
diff -urN a/configure.ac b/configure.ac
--- a/configure.ac 2014-10-11 14:19:50.412185500 +0100
+++ b/configure.ac 2014-10-11 14:19:53.083338300 +0100
@@ -2084,6 +2084,9 @@
CYGWIN*) SHLIB_SUFFIX=.dll;;
*) SHLIB_SUFFIX=.so;;
esac
@@ -11,7 +11,7 @@ diff -Naur a/configure.ac b/configure.ac
fi
AC_MSG_RESULT($SHLIB_SUFFIX)
@@ -3043,6 +3046,12 @@
@@ -3060,6 +3063,12 @@
fi
;;
esac
@@ -24,7 +24,7 @@ diff -Naur a/configure.ac b/configure.ac
fi
AC_MSG_RESULT($DYNLOADFILE)
if test "$DYNLOADFILE" != "dynload_stub.o"
@@ -4276,6 +4285,12 @@
@@ -4293,6 +4302,12 @@
*)
EXT_SUFFIX=${SHLIB_SUFFIX};;
esac
@@ -37,10 +37,10 @@ diff -Naur a/configure.ac b/configure.ac
AC_MSG_CHECKING(LDVERSION)
LDVERSION='$(VERSION)$(ABIFLAGS)'
diff -Naur a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in 2014-05-20 00:54:59.932000000 +0400
+++ b/Makefile.pre.in 2014-05-20 00:55:08.262400000 +0400
@@ -731,6 +731,12 @@
diff -urN a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in 2014-10-11 14:19:50.412185500 +0100
+++ b/Makefile.pre.in 2014-10-11 14:19:53.085338400 +0100
@@ -746,6 +746,12 @@
-DSHLIB_EXT='"$(EXT_SUFFIX)"' \
-o $@ $(srcdir)/Python/dynload_hpux.c
@@ -53,9 +53,9 @@ diff -Naur a/Makefile.pre.in b/Makefile.pre.in
Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile
$(CC) -c $(PY_CORE_CFLAGS) \
-DABIFLAGS='"$(ABIFLAGS)"' \
diff -Naur a/Python/dynload_win.c b/Python/dynload_win.c
--- a/Python/dynload_win.c 2014-05-19 09:19:39.000000000 +0400
+++ b/Python/dynload_win.c 2014-05-20 00:55:08.262400000 +0400
diff -urN a/Python/dynload_win.c b/Python/dynload_win.c
--- a/Python/dynload_win.c 2014-10-11 14:19:50.418185800 +0100
+++ b/Python/dynload_win.c 2014-10-11 14:19:53.087338500 +0100
@@ -18,6 +18,12 @@
#endif