python3: Update to 3.5.2
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py
|
||||
--- Python-3.5.0-orig/Lib/sysconfig.py 2015-09-13 14:41:21.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/sysconfig.py 2015-09-21 13:41:02.028646700 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/sysconfig.py Python-3.5.2/Lib/sysconfig.py
|
||||
--- Python-3.5.2-orig/Lib/sysconfig.py 2016-06-26 00:38:36.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/sysconfig.py 2016-07-12 14:20:28.876300700 +0300
|
||||
@@ -257,6 +257,7 @@
|
||||
# if the expansion uses the name without a prefix.
|
||||
renamed_variables = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS')
|
||||
@@ -9,7 +9,7 @@ diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py
|
||||
while len(variables) > 0:
|
||||
for name in tuple(variables):
|
||||
value = notdone[name]
|
||||
@@ -393,6 +394,19 @@
|
||||
@@ -398,6 +399,19 @@
|
||||
f.write('build_time_vars = ')
|
||||
pprint.pprint(vars, stream=f)
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
--- Python-3.5.0/Lib/distutils/spawn.py.orig 2015-09-13 12:41:21.000000000 +0100
|
||||
+++ Python-3.5.0/Lib/distutils/spawn.py 2016-01-01 22:56:13.888427600 +0000
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/spawn.py Python-3.5.2/Lib/distutils/spawn.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/spawn.py 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/spawn.py 2016-07-12 14:20:31.245800700 +0300
|
||||
@@ -12,6 +12,7 @@
|
||||
from distutils.errors import DistutilsPlatformError, DistutilsExecError
|
||||
from distutils.debug import DEBUG
|
||||
@@ -31,9 +32,10 @@
|
||||
return args
|
||||
|
||||
def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
|
||||
--- Python-3.5.0/setup.py.orig 2016-01-01 23:31:43.768193600 +0000
|
||||
+++ Python-3.5.0/setup.py 2016-01-01 23:54:46.268820600 +0000
|
||||
@@ -1208,11 +1208,7 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-06-26 00:38:39.000000000 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:20:31.254300700 +0300
|
||||
@@ -1173,11 +1173,7 @@
|
||||
'_sqlite/statement.c',
|
||||
'_sqlite/util.c', ]
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-13 14:41:26.000000000 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:04.204429100 +0300
|
||||
@@ -1576,6 +1576,37 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-06-26 00:38:39.000000000 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:20:33.114800700 +0300
|
||||
@@ -1701,6 +1701,37 @@
|
||||
BASECFLAGS="$BASECFLAGS $ac_arch_flags"
|
||||
fi
|
||||
|
||||
@@ -39,15 +39,15 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
# On some compilers, pthreads are available without further options
|
||||
# (e.g. MacOS X). On some of these systems, the compiler will not
|
||||
# complain if unaccepted options are passed (e.g. gcc on Mac OS X).
|
||||
@@ -1603,6 +1634,7 @@
|
||||
@@ -1728,6 +1759,7 @@
|
||||
],[ac_cv_pthread_is_default=no],[ac_cv_pthread_is_default=no])
|
||||
])
|
||||
AC_MSG_RESULT($ac_cv_pthread_is_default)
|
||||
+fi
|
||||
|
||||
|
||||
if test $ac_cv_pthread_is_default = yes
|
||||
@@ -1694,6 +1726,9 @@
|
||||
if test $ac_cv_pthread_is_default = yes
|
||||
@@ -1819,6 +1851,9 @@
|
||||
AC_MSG_RESULT($ac_cv_pthread)
|
||||
fi
|
||||
|
||||
@@ -57,8 +57,8 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
# If we have set a CC compiler flag for thread support then
|
||||
# check if it works for CXX, too.
|
||||
ac_cv_cxx_thread=no
|
||||
@@ -1714,6 +1749,10 @@
|
||||
then
|
||||
@@ -1839,6 +1874,10 @@
|
||||
then
|
||||
CXX="$CXX -pthread"
|
||||
ac_cv_cxx_thread=yes
|
||||
+elif test $ac_cv_ntthread = yes
|
||||
@@ -68,7 +68,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
fi
|
||||
|
||||
if test $ac_cv_cxx_thread = yes
|
||||
@@ -1743,6 +1782,11 @@
|
||||
@@ -1868,6 +1907,11 @@
|
||||
dnl AC_MSG_RESULT($cpp_type)
|
||||
|
||||
# checks for header files
|
||||
@@ -80,7 +80,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
AC_HEADER_STDC
|
||||
AC_CHECK_HEADERS(asm/types.h conio.h direct.h dlfcn.h errno.h \
|
||||
fcntl.h grp.h \
|
||||
@@ -2012,9 +2056,14 @@
|
||||
@@ -2137,9 +2181,14 @@
|
||||
|
||||
AC_MSG_CHECKING(for pthread_t)
|
||||
have_pthread_t=no
|
||||
@@ -95,7 +95,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
AC_MSG_RESULT($have_pthread_t)
|
||||
if test "$have_pthread_t" = yes ; then
|
||||
AC_CHECK_SIZEOF(pthread_t, [], [
|
||||
@@ -2431,11 +2480,16 @@
|
||||
@@ -2556,11 +2605,16 @@
|
||||
[Define if the libcrypto has RAND_egd]))
|
||||
|
||||
# only check for sem_init if thread support is requested
|
||||
@@ -112,7 +112,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
|
||||
# check if we need libintl for locale functions
|
||||
AC_CHECK_LIB(intl, textdomain,
|
||||
@@ -2715,6 +2769,13 @@
|
||||
@@ -2840,6 +2894,13 @@
|
||||
AC_DEFINE(WITH_THREAD)
|
||||
posix_threads=yes
|
||||
THREADOBJ="Python/thread.o"
|
||||
@@ -126,7 +126,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
else
|
||||
if test ! -z "$with_threads" -a -d "$with_threads"
|
||||
then LDFLAGS="$LDFLAGS -L$with_threads"
|
||||
@@ -3144,6 +3205,15 @@
|
||||
@@ -3269,6 +3330,15 @@
|
||||
fi
|
||||
|
||||
# checks for library functions
|
||||
@@ -142,7 +142,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
|
||||
clock confstr ctermid dup3 execv faccessat fchmod fchmodat fchown fchownat \
|
||||
fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
|
||||
@@ -4146,6 +4216,10 @@
|
||||
@@ -4271,6 +4341,10 @@
|
||||
# the kernel module that provides POSIX semaphores
|
||||
# isn't loaded by default, so an attempt to call
|
||||
# sem_open results in a 'Signal 12' error.
|
||||
@@ -153,7 +153,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
AC_MSG_CHECKING(whether POSIX semaphores are enabled)
|
||||
AC_CACHE_VAL(ac_cv_posix_semaphores_enabled,
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||
@@ -4179,6 +4253,14 @@
|
||||
@@ -4304,6 +4378,14 @@
|
||||
|
||||
# Multiprocessing check for broken sem_getvalue
|
||||
AC_MSG_CHECKING(for broken sem_getvalue)
|
||||
@@ -168,10 +168,10 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
AC_CACHE_VAL(ac_cv_broken_sem_getvalue,
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||
#include <unistd.h>
|
||||
diff -Naur Python-3.5.0-orig/pyconfig.h.in Python-3.5.0/pyconfig.h.in
|
||||
--- Python-3.5.0-orig/pyconfig.h.in 2015-09-13 14:41:26.000000000 +0300
|
||||
+++ Python-3.5.0/pyconfig.h.in 2015-09-21 13:41:04.221427400 +0300
|
||||
@@ -1193,6 +1193,9 @@
|
||||
diff -Naur Python-3.5.2-orig/pyconfig.h.in Python-3.5.2/pyconfig.h.in
|
||||
--- Python-3.5.2-orig/pyconfig.h.in 2016-06-26 00:38:39.000000000 +0300
|
||||
+++ Python-3.5.2/pyconfig.h.in 2016-07-12 14:20:33.147800700 +0300
|
||||
@@ -1198,6 +1198,9 @@
|
||||
/* Define if mvwdelch in curses.h is an expression. */
|
||||
#undef MVWDELCH_IS_EXPRESSION
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Include/pyport.h Python-3.5.0/Include/pyport.h
|
||||
--- Python-3.5.0-orig/Include/pyport.h 2015-09-13 14:41:20.000000000 +0300
|
||||
+++ Python-3.5.0/Include/pyport.h 2015-09-21 13:41:05.553294200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Include/pyport.h Python-3.5.2/Include/pyport.h
|
||||
--- Python-3.5.2-orig/Include/pyport.h 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Include/pyport.h 2016-07-12 14:20:35.072800700 +0300
|
||||
@@ -13,6 +13,21 @@
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:05.423307200 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:06.783171200 +0300
|
||||
@@ -359,6 +359,17 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:34.763300700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:20:36.876800700 +0300
|
||||
@@ -360,6 +360,17 @@
|
||||
# Set name for machine-dependent library files
|
||||
AC_ARG_VAR([MACHDEP], [name for machine-dependent library files])
|
||||
AC_MSG_CHECKING(MACHDEP)
|
||||
@@ -19,7 +19,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
if test -z "$MACHDEP"
|
||||
then
|
||||
# avoid using uname for cross builds
|
||||
@@ -418,12 +429,23 @@
|
||||
@@ -419,12 +430,23 @@
|
||||
*-*-cygwin*)
|
||||
_host_cpu=
|
||||
;;
|
||||
@@ -43,9 +43,9 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
fi
|
||||
|
||||
# Some systems cannot stand _XOPEN_SOURCE being defined at all; they
|
||||
diff -Naur Python-3.5.0-orig/Python/getplatform.c Python-3.5.0/Python/getplatform.c
|
||||
--- Python-3.5.0-orig/Python/getplatform.c 2015-09-13 14:41:26.000000000 +0300
|
||||
+++ Python-3.5.0/Python/getplatform.c 2015-09-21 13:41:06.789170600 +0300
|
||||
diff -Naur Python-3.5.2-orig/Python/getplatform.c Python-3.5.2/Python/getplatform.c
|
||||
--- Python-3.5.2-orig/Python/getplatform.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Python/getplatform.c 2016-07-12 14:20:36.933300700 +0300
|
||||
@@ -1,6 +1,12 @@
|
||||
|
||||
#include "Python.h"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:07.953054200 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:08.078041700 +0300
|
||||
@@ -880,6 +880,27 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:38.518800700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:20:38.790800700 +0300
|
||||
@@ -898,6 +898,27 @@
|
||||
AC_SUBST(PLATDIR)
|
||||
AC_SUBST(PLATFORM_TRIPLET)
|
||||
|
||||
@@ -29,9 +29,9 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
|
||||
AC_MSG_CHECKING([for -Wl,--no-as-needed])
|
||||
save_LDFLAGS="$LDFLAGS"
|
||||
diff -Naur Python-3.5.0-orig/Misc/config_mingw Python-3.5.0/Misc/config_mingw
|
||||
--- Python-3.5.0-orig/Misc/config_mingw 1970-01-01 03:00:00.000000000 +0300
|
||||
+++ Python-3.5.0/Misc/config_mingw 2015-09-21 13:41:08.092040300 +0300
|
||||
diff -Naur Python-3.5.2-orig/Misc/config_mingw Python-3.5.2/Misc/config_mingw
|
||||
--- Python-3.5.2-orig/Misc/config_mingw 1970-01-01 03:00:00.000000000 +0300
|
||||
+++ Python-3.5.2/Misc/config_mingw 2016-07-12 14:20:38.832800700 +0300
|
||||
@@ -0,0 +1,12 @@
|
||||
+# configure defaults for mingw* hosts
|
||||
+
|
||||
@@ -45,9 +45,9 @@ diff -Naur Python-3.5.0-orig/Misc/config_mingw Python-3.5.0/Misc/config_mingw
|
||||
+# files to ignore
|
||||
+ac_cv_file__dev_ptmx=ignore #NOTE: under MSYS environment device exist
|
||||
+ac_cv_file__dev_ptc=no
|
||||
diff -Naur Python-3.5.0-orig/Misc/cross_mingw32 Python-3.5.0/Misc/cross_mingw32
|
||||
--- Python-3.5.0-orig/Misc/cross_mingw32 1970-01-01 03:00:00.000000000 +0300
|
||||
+++ Python-3.5.0/Misc/cross_mingw32 2015-09-21 13:41:08.098039700 +0300
|
||||
diff -Naur Python-3.5.2-orig/Misc/cross_mingw32 Python-3.5.2/Misc/cross_mingw32
|
||||
--- Python-3.5.2-orig/Misc/cross_mingw32 1970-01-01 03:00:00.000000000 +0300
|
||||
+++ Python-3.5.2/Misc/cross_mingw32 2016-07-12 14:20:38.838300700 +0300
|
||||
@@ -0,0 +1,11 @@
|
||||
+# configure defaults for mingw32 host if cross-build
|
||||
+
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:09.253924100 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:09.399909500 +0300
|
||||
@@ -2061,10 +2061,22 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:40.364800700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:20:40.673300700 +0300
|
||||
@@ -2186,10 +2186,22 @@
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING(whether to enable large file support)
|
||||
@@ -21,10 +21,10 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
+fi
|
||||
+fi
|
||||
+if test $have_largefile_support = yes ; then
|
||||
AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1,
|
||||
AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1,
|
||||
[Defined to enable large file support when an off_t is bigger than a long
|
||||
and long long is available and at least as big as an off_t. You may need
|
||||
@@ -2074,9 +2086,6 @@
|
||||
@@ -2199,9 +2211,6 @@
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Python/random.c Python-3.5.0/Python/random.c
|
||||
--- Python-3.5.0-orig/Python/random.c 2015-09-13 14:41:26.000000000 +0300
|
||||
+++ Python-3.5.0/Python/random.c 2015-09-21 13:41:10.674782000 +0300
|
||||
diff -Naur Python-3.5.2-orig/Python/random.c Python-3.5.2/Python/random.c
|
||||
--- Python-3.5.2-orig/Python/random.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Python/random.c 2016-07-12 14:20:42.514300700 +0300
|
||||
@@ -1,6 +1,12 @@
|
||||
#include "Python.h"
|
||||
#ifdef MS_WINDOWS
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:10.567792700 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:11.868662600 +0300
|
||||
@@ -5068,6 +5068,16 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:42.226800700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:20:44.334300700 +0300
|
||||
@@ -5198,6 +5198,16 @@
|
||||
THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
|
||||
done
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:12.983551100 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:13.084541000 +0300
|
||||
@@ -578,6 +578,14 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:45.895800700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:20:46.270300700 +0300
|
||||
@@ -579,6 +579,14 @@
|
||||
fi
|
||||
AC_MSG_RESULT($MACHDEP)
|
||||
|
||||
@@ -16,10 +16,10 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
# Record the configure-time value of MACOSX_DEPLOYMENT_TARGET,
|
||||
# it may influence the way we can build extensions, so distutils
|
||||
# needs to check it
|
||||
diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmodule.c
|
||||
--- Python-3.5.0-orig/Modules/posixmodule.c 2015-09-13 14:41:25.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/posixmodule.c 2015-09-21 13:41:13.100539400 +0300
|
||||
@@ -154,6 +154,25 @@
|
||||
diff -Naur Python-3.5.2-orig/Modules/posixmodule.c Python-3.5.2/Modules/posixmodule.c
|
||||
--- Python-3.5.2-orig/Modules/posixmodule.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/posixmodule.c 2016-07-12 14:20:46.281800700 +0300
|
||||
@@ -156,6 +156,25 @@
|
||||
#define HAVE_CWAIT 1
|
||||
#define HAVE_FSYNC 1
|
||||
#define fsync _commit
|
||||
@@ -45,7 +45,7 @@ diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmod
|
||||
#else
|
||||
/* Unix functions that the configure script doesn't check for */
|
||||
#define HAVE_EXECV 1
|
||||
@@ -274,7 +293,7 @@
|
||||
@@ -276,7 +295,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -54,7 +54,7 @@ diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmod
|
||||
#ifdef HAVE_DIRECT_H
|
||||
#include <direct.h>
|
||||
#endif
|
||||
@@ -1126,7 +1145,7 @@
|
||||
@@ -1128,7 +1147,7 @@
|
||||
*/
|
||||
#include <crt_externs.h>
|
||||
static char **environ;
|
||||
@@ -63,9 +63,9 @@ diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmod
|
||||
extern char **environ;
|
||||
#endif /* !_MSC_VER */
|
||||
|
||||
diff -Naur Python-3.5.0-orig/Modules/Setup.config.in Python-3.5.0/Modules/Setup.config.in
|
||||
--- Python-3.5.0-orig/Modules/Setup.config.in 2015-09-13 14:41:24.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/Setup.config.in 2015-09-21 13:41:13.141535300 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/Setup.config.in Python-3.5.2/Modules/Setup.config.in
|
||||
--- Python-3.5.2-orig/Modules/Setup.config.in 2016-06-26 00:38:37.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/Setup.config.in 2016-07-12 14:20:46.330300700 +0300
|
||||
@@ -3,6 +3,9 @@
|
||||
# The purpose of this file is to conditionally enable certain modules
|
||||
# based on configure-time options.
|
||||
@@ -76,9 +76,9 @@ diff -Naur Python-3.5.0-orig/Modules/Setup.config.in Python-3.5.0/Modules/Setup.
|
||||
# Threading
|
||||
@USE_THREAD_MODULE@_thread _threadmodule.c
|
||||
|
||||
diff -Naur Python-3.5.0-orig/Modules/Setup.dist Python-3.5.0/Modules/Setup.dist
|
||||
--- Python-3.5.0-orig/Modules/Setup.dist 2015-09-13 14:41:24.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/Setup.dist 2015-09-21 13:41:13.150534400 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/Setup.dist Python-3.5.2/Modules/Setup.dist
|
||||
--- Python-3.5.2-orig/Modules/Setup.dist 2016-06-26 00:38:37.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/Setup.dist 2016-07-12 14:20:46.345300700 +0300
|
||||
@@ -105,7 +105,6 @@
|
||||
# This only contains the minimal set of modules required to run the
|
||||
# setup.py script in the root of the Python source tree.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:14.283421100 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:14.407408700 +0300
|
||||
@@ -3815,6 +3815,27 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:47.973300700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:20:48.333800700 +0300
|
||||
@@ -3940,6 +3940,27 @@
|
||||
AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [struct sockaddr_storage (sys/socket.h)])
|
||||
fi
|
||||
|
||||
@@ -29,9 +29,9 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
# checks for compiler characteristics
|
||||
|
||||
AC_C_CHAR_UNSIGNED
|
||||
diff -Naur Python-3.5.0-orig/Modules/winreparse.h Python-3.5.0/Modules/winreparse.h
|
||||
--- Python-3.5.0-orig/Modules/winreparse.h 2015-09-13 14:41:25.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/winreparse.h 2015-09-21 13:41:14.427406700 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/winreparse.h Python-3.5.2/Modules/winreparse.h
|
||||
--- Python-3.5.2-orig/Modules/winreparse.h 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/winreparse.h 2016-07-12 14:20:48.344300700 +0300
|
||||
@@ -12,6 +12,15 @@
|
||||
http://msdn.microsoft.com/en-us/library/ff552012.aspx as the required
|
||||
include doesn't seem to be present in the Windows SDK (at least as included
|
||||
@@ -60,10 +60,10 @@ diff -Naur Python-3.5.0-orig/Modules/winreparse.h Python-3.5.0/Modules/winrepars
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
diff -Naur Python-3.5.0-orig/pyconfig.h.in Python-3.5.0/pyconfig.h.in
|
||||
--- Python-3.5.0-orig/pyconfig.h.in 2015-09-21 13:41:05.444305100 +0300
|
||||
+++ Python-3.5.0/pyconfig.h.in 2015-09-21 13:41:14.440405400 +0300
|
||||
@@ -711,6 +711,9 @@
|
||||
diff -Naur Python-3.5.2-orig/pyconfig.h.in Python-3.5.2/pyconfig.h.in
|
||||
--- Python-3.5.2-orig/pyconfig.h.in 2016-07-12 14:20:34.795800700 +0300
|
||||
+++ Python-3.5.2/pyconfig.h.in 2016-07-12 14:20:48.350300700 +0300
|
||||
@@ -717,6 +717,9 @@
|
||||
/* Define if readline supports append_history */
|
||||
#undef HAVE_RL_APPEND_HISTORY
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:15.569292500 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:15.713278100 +0300
|
||||
@@ -2742,6 +2742,14 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:49.960800700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:20:50.311300700 +0300
|
||||
@@ -2867,6 +2867,14 @@
|
||||
fi])
|
||||
AC_MSG_RESULT($with_dbmliborder)
|
||||
|
||||
@@ -16,25 +16,24 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
# Determine if signalmodule should be used.
|
||||
AC_SUBST(USE_SIGNAL_MODULE)
|
||||
AC_SUBST(SIGNAL_OBJS)
|
||||
diff -Naur Python-3.5.0-orig/Modules/Setup.config.in Python-3.5.0/Modules/Setup.config.in
|
||||
--- Python-3.5.0-orig/Modules/Setup.config.in 2015-09-21 13:41:14.300419400 +0300
|
||||
+++ Python-3.5.0/Modules/Setup.config.in 2015-09-21 13:41:15.757273700 +0300
|
||||
@@ -12,8 +12,11 @@
|
||||
# Threading
|
||||
diff -Naur Python-3.5.2-orig/Modules/Setup.config.in Python-3.5.2/Modules/Setup.config.in
|
||||
--- Python-3.5.2-orig/Modules/Setup.config.in 2016-07-12 14:20:48.038800700 +0300
|
||||
+++ Python-3.5.2/Modules/Setup.config.in 2016-07-12 14:20:50.320300700 +0300
|
||||
@@ -10,7 +10,10 @@
|
||||
@USE_THREAD_MODULE@_thread _threadmodule.c
|
||||
|
||||
# The signal module
|
||||
-@USE_SIGNAL_MODULE@_signal signalmodule.c
|
||||
+@USE_SIGNAL_MODULE@_signal signalmodule.c -lws2_32
|
||||
|
||||
+
|
||||
+# build-in modules for windows platform:
|
||||
+@USE_WIN32_MODULE@winreg ../PC/winreg.c
|
||||
+
|
||||
|
||||
# The rest of the modules previously listed in this file are built
|
||||
# by the setup.py script in Python 2.1 and later.
|
||||
diff -Naur Python-3.5.0-orig/PC/winreg.c Python-3.5.0/PC/winreg.c
|
||||
--- Python-3.5.0-orig/PC/winreg.c 2015-09-13 14:41:25.000000000 +0300
|
||||
+++ Python-3.5.0/PC/winreg.c 2015-09-21 13:41:15.767272700 +0300
|
||||
diff -Naur Python-3.5.2-orig/PC/winreg.c Python-3.5.2/PC/winreg.c
|
||||
--- Python-3.5.2-orig/PC/winreg.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/PC/winreg.c 2016-07-12 14:20:50.352300700 +0300
|
||||
@@ -16,6 +16,25 @@
|
||||
#include "structmember.h"
|
||||
#include "windows.h"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:16.957153700 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:17.094140000 +0300
|
||||
@@ -2750,6 +2750,13 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:52.008800700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:20:52.326800700 +0300
|
||||
@@ -2875,6 +2875,13 @@
|
||||
*-*-mingw*) USE_WIN32_MODULE=;;
|
||||
esac
|
||||
|
||||
@@ -15,9 +15,9 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
# Determine if signalmodule should be used.
|
||||
AC_SUBST(USE_SIGNAL_MODULE)
|
||||
AC_SUBST(SIGNAL_OBJS)
|
||||
diff -Naur Python-3.5.0-orig/Modules/Setup.config.in Python-3.5.0/Modules/Setup.config.in
|
||||
--- Python-3.5.0-orig/Modules/Setup.config.in 2015-09-21 13:41:16.975151900 +0300
|
||||
+++ Python-3.5.0/Modules/Setup.config.in 2015-09-21 13:41:17.109138500 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/Setup.config.in Python-3.5.2/Modules/Setup.config.in
|
||||
--- Python-3.5.2-orig/Modules/Setup.config.in 2016-07-12 14:20:52.015300700 +0300
|
||||
+++ Python-3.5.2/Modules/Setup.config.in 2016-07-12 14:20:52.344800700 +0300
|
||||
@@ -6,6 +6,9 @@
|
||||
# init system calls(posix/nt/...) for INITFUNC (used by makesetup)
|
||||
@INITSYS@ posixmodule.c
|
||||
@@ -28,9 +28,9 @@ diff -Naur Python-3.5.0-orig/Modules/Setup.config.in Python-3.5.0/Modules/Setup.
|
||||
# Threading
|
||||
@USE_THREAD_MODULE@_thread _threadmodule.c
|
||||
|
||||
diff -Naur Python-3.5.0-orig/Modules/Setup.dist Python-3.5.0/Modules/Setup.dist
|
||||
--- Python-3.5.0-orig/Modules/Setup.dist 2015-09-21 13:41:14.307418700 +0300
|
||||
+++ Python-3.5.0/Modules/Setup.dist 2015-09-21 13:41:17.134136000 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/Setup.dist Python-3.5.2/Modules/Setup.dist
|
||||
--- Python-3.5.2-orig/Modules/Setup.dist 2016-07-12 14:20:48.046300700 +0300
|
||||
+++ Python-3.5.2/Modules/Setup.dist 2016-07-12 14:20:52.351800700 +0300
|
||||
@@ -106,8 +106,6 @@
|
||||
# setup.py script in the root of the Python source tree.
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:18.284021000 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:18.437005700 +0300
|
||||
@@ -5122,8 +5122,21 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:53.877300700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:20:54.264800700 +0300
|
||||
@@ -5252,8 +5252,21 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -23,10 +23,10 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
AC_MSG_CHECKING(for build directories)
|
||||
for dir in $SRCDIRS; do
|
||||
if test ! -d $dir; then
|
||||
diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
--- Python-3.5.0-orig/Makefile.pre.in 2015-09-13 14:41:23.000000000 +0300
|
||||
+++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:41:18.444005000 +0300
|
||||
@@ -242,7 +242,7 @@
|
||||
diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in
|
||||
--- Python-3.5.2-orig/Makefile.pre.in 2016-06-26 00:38:37.000000000 +0300
|
||||
+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:20:54.272800700 +0300
|
||||
@@ -249,7 +249,7 @@
|
||||
# Modules
|
||||
MODULE_OBJS= \
|
||||
Modules/config.o \
|
||||
@@ -35,7 +35,7 @@ diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
Modules/main.o \
|
||||
Modules/gcmodule.o
|
||||
|
||||
@@ -721,6 +721,7 @@
|
||||
@@ -747,6 +747,7 @@
|
||||
-DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \
|
||||
-o $@ $(srcdir)/Modules/getbuildinfo.c
|
||||
|
||||
@@ -43,7 +43,7 @@ diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
|
||||
$(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
|
||||
-DPREFIX='"$(prefix)"' \
|
||||
@@ -729,6 +730,13 @@
|
||||
@@ -755,6 +756,13 @@
|
||||
-DVPATH='"$(VPATH)"' \
|
||||
-o $@ $(srcdir)/Modules/getpath.c
|
||||
|
||||
@@ -57,9 +57,9 @@ diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
Programs/python.o: $(srcdir)/Programs/python.c
|
||||
$(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/python.c
|
||||
|
||||
diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
--- Python-3.5.0-orig/PC/getpathp.c 2015-09-13 14:41:25.000000000 +0300
|
||||
+++ Python-3.5.0/PC/getpathp.c 2015-09-21 13:41:18.457003700 +0300
|
||||
diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c
|
||||
--- Python-3.5.2-orig/PC/getpathp.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/PC/getpathp.c 2016-07-12 14:20:54.300800700 +0300
|
||||
@@ -87,10 +87,26 @@
|
||||
* with a semicolon separated path prior to calling Py_Initialize.
|
||||
*/
|
||||
@@ -157,7 +157,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
/* gotlandmark only called by search_for_prefix, which ensures
|
||||
'prefix' is null terminated in bounds. join() ensures
|
||||
'landmark' can not overflow prefix if too long.
|
||||
@@ -488,6 +567,9 @@
|
||||
@@ -491,6 +570,9 @@
|
||||
size_t bufsz;
|
||||
wchar_t *pythonhome = Py_GetPythonHome();
|
||||
wchar_t *envpath = NULL;
|
||||
@@ -167,7 +167,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
|
||||
#ifdef MS_WINDOWS
|
||||
int skiphome, skipdefault;
|
||||
@@ -560,6 +642,16 @@
|
||||
@@ -563,6 +645,16 @@
|
||||
}
|
||||
}
|
||||
|
||||
@@ -184,7 +184,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
if (pythonhome == NULL || *pythonhome == '\0') {
|
||||
if (search_for_prefix(argv0_path, LANDMARK))
|
||||
pythonhome = prefix;
|
||||
@@ -568,11 +660,11 @@
|
||||
@@ -571,11 +663,11 @@
|
||||
}
|
||||
else
|
||||
wcscpy_s(prefix, MAXPATHLEN+1, pythonhome);
|
||||
@@ -197,7 +197,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
#ifdef MS_WINDOWS
|
||||
/* Calculate zip archive path from DLL or exe path */
|
||||
if (wcscpy_s(zip_path, MAXPATHLEN+1, dllpath[0] ? dllpath : progpath))
|
||||
@@ -624,6 +716,9 @@
|
||||
@@ -627,6 +719,9 @@
|
||||
}
|
||||
else
|
||||
bufsz = 0;
|
||||
@@ -207,7 +207,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
bufsz += wcslen(PYTHONPATH) + 1;
|
||||
bufsz += wcslen(argv0_path) + 1;
|
||||
#ifdef MS_WINDOWS
|
||||
@@ -668,6 +763,11 @@
|
||||
@@ -671,6 +766,11 @@
|
||||
buf = wcschr(buf, L'\0');
|
||||
*buf++ = DELIM;
|
||||
}
|
||||
@@ -219,7 +219,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
if (userpath) {
|
||||
if (wcscpy_s(buf, bufsz - (buf - module_search_path), userpath))
|
||||
Py_FatalError("buffer overflow in getpathp.c's calculate_path()");
|
||||
@@ -736,6 +836,12 @@
|
||||
@@ -739,6 +839,12 @@
|
||||
on the path, and that our 'prefix' directory is
|
||||
the parent of that.
|
||||
*/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Python/fileblocks.c Python-3.5.0/Python/fileblocks.c
|
||||
--- Python-3.5.0-orig/Python/fileblocks.c 1970-01-01 03:00:00.000000000 +0300
|
||||
+++ Python-3.5.0/Python/fileblocks.c 2015-09-21 13:41:19.806868700 +0300
|
||||
diff -Naur Python-3.5.2-orig/Python-3.5.0/Python/fileblocks.c Python-3.5.2/Python-3.5.0/Python/fileblocks.c
|
||||
--- Python-3.5.2-orig/Python-3.5.0/Python/fileblocks.c 1970-01-01 03:00:00.000000000 +0300
|
||||
+++ Python-3.5.2/Python-3.5.0/Python/fileblocks.c 2016-07-12 14:20:56.221800700 +0300
|
||||
@@ -0,0 +1,17 @@
|
||||
+/*
|
||||
+-- Macro: AC_STRUCT_ST_BLOCKS
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff -Naur Python-3.5.0-orig/Programs/python.c Python-3.5.0/Programs/python.c
|
||||
--- Python-3.5.0-orig/Programs/python.c 2015-09-13 14:41:26.000000000 +0300
|
||||
+++ Python-3.5.0/Programs/python.c 2015-09-21 13:41:21.061743200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Programs/python.c Python-3.5.2/Programs/python.c
|
||||
--- Python-3.5.2-orig/Programs/python.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Programs/python.c 2016-07-12 14:20:58.090300700 +0300
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <floatingpoint.h>
|
||||
#include <fenv.h>
|
||||
#endif
|
||||
|
||||
-#ifdef MS_WINDOWS
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/sysconfig.py Python-3.5.0/Lib/distutils/sysconfig.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/sysconfig.py 2015-09-13 14:41:21.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/sysconfig.py 2015-09-21 13:41:22.329616400 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/sysconfig.py Python-3.5.2/Lib/distutils/sysconfig.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/sysconfig.py 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/sysconfig.py 2016-07-12 14:20:59.990800700 +0300
|
||||
@@ -156,7 +156,23 @@
|
||||
Mainly needed on Unix, so we can plug in the information that
|
||||
varies across Unices and is stored in Python's Makefile.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/unixccompiler.py Python-3.5.0/Lib/distutils/unixccompiler.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/unixccompiler.py 2015-09-13 14:41:21.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/unixccompiler.py 2015-09-21 13:41:23.620487300 +0300
|
||||
@@ -238,9 +238,13 @@
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/unixccompiler.py Python-3.5.2/Lib/distutils/unixccompiler.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/unixccompiler.py 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/unixccompiler.py 2016-07-12 14:21:01.830800700 +0300
|
||||
@@ -240,9 +240,13 @@
|
||||
# -Wl whenever gcc was used in the past it is probably
|
||||
# safest to keep doing so.
|
||||
if sysconfig.get_config_var("GNULD") == "yes":
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:41:19.691880200 +0300
|
||||
+++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:41:24.859363400 +0300
|
||||
@@ -647,9 +647,9 @@
|
||||
diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in
|
||||
--- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:20:55.974800700 +0300
|
||||
+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:21:03.706300700 +0300
|
||||
@@ -669,9 +669,9 @@
|
||||
$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)
|
||||
$(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
|
||||
|
||||
@@ -13,9 +13,9 @@ diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
if test -n "$(DLLLIBRARY)"; then \
|
||||
$(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
|
||||
$(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \
|
||||
diff -Naur Python-3.5.0-orig/Modules/makesetup Python-3.5.0/Modules/makesetup
|
||||
--- Python-3.5.0-orig/Modules/makesetup 2015-09-13 14:41:25.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/makesetup 2015-09-21 13:41:24.864362900 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/makesetup Python-3.5.2/Modules/makesetup
|
||||
--- Python-3.5.2-orig/Modules/makesetup 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/makesetup 2016-07-12 14:21:03.740800700 +0300
|
||||
@@ -91,7 +91,7 @@
|
||||
else
|
||||
ExtraLibDir='$(LIBPL)'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Include/pyport.h Python-3.5.0/Include/pyport.h
|
||||
--- Python-3.5.0-orig/Include/pyport.h 2015-09-21 13:41:06.668182700 +0300
|
||||
+++ Python-3.5.0/Include/pyport.h 2015-09-21 13:41:26.146234700 +0300
|
||||
diff -Naur Python-3.5.2-orig/Include/pyport.h Python-3.5.2/Include/pyport.h
|
||||
--- Python-3.5.2-orig/Include/pyport.h 2016-07-12 14:20:36.581800700 +0300
|
||||
+++ Python-3.5.2/Include/pyport.h 2016-07-12 14:21:05.634800700 +0300
|
||||
@@ -736,37 +736,39 @@
|
||||
*/
|
||||
|
||||
@@ -62,10 +62,10 @@ diff -Naur Python-3.5.0-orig/Include/pyport.h Python-3.5.0/Include/pyport.h
|
||||
# endif /* HAVE_DECLSPEC */
|
||||
#endif /* Py_ENABLE_SHARED */
|
||||
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-13 14:41:26.000000000 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:41:26.161233200 +0300
|
||||
@@ -184,6 +184,9 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:20:32.823300700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:21:05.660300700 +0300
|
||||
@@ -200,6 +200,9 @@
|
||||
|
||||
def build_extensions(self):
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:19.666882700 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:27.465102800 +0300
|
||||
@@ -1174,6 +1174,13 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:55.967800700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:21:07.520800700 +0300
|
||||
@@ -1192,6 +1192,13 @@
|
||||
;;
|
||||
|
||||
esac
|
||||
@@ -15,7 +15,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
else # shared is disabled
|
||||
PY_ENABLE_SHARED=0
|
||||
case $ac_sys_system in
|
||||
@@ -1182,6 +1189,10 @@
|
||||
@@ -1200,6 +1207,10 @@
|
||||
LDLIBRARY='libpython$(LDVERSION).dll.a'
|
||||
;;
|
||||
esac
|
||||
@@ -26,7 +26,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
fi
|
||||
|
||||
if test "$cross_compiling" = yes; then
|
||||
@@ -2401,6 +2412,12 @@
|
||||
@@ -2526,6 +2537,12 @@
|
||||
LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";;
|
||||
*) LDSHARED="ld";;
|
||||
esac
|
||||
@@ -39,7 +39,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
fi
|
||||
AC_MSG_RESULT($LDSHARED)
|
||||
LDCXXSHARED=${LDCXXSHARED-$LDSHARED}
|
||||
@@ -5118,7 +5135,8 @@
|
||||
@@ -5248,7 +5265,8 @@
|
||||
dnl "errmap.h" from $srcdir/PC.
|
||||
dnl Note we cannot use BASECPPFLAGS as autogenerated pyconfig.h
|
||||
dnl has to be before customized located in ../PC.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:28.609988300 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:28.722977000 +0300
|
||||
@@ -2272,6 +2272,9 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:21:09.091800700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:21:09.347800700 +0300
|
||||
@@ -2397,6 +2397,9 @@
|
||||
CYGWIN*) SHLIB_SUFFIX=.dll;;
|
||||
*) SHLIB_SUFFIX=.so;;
|
||||
esac
|
||||
@@ -11,7 +11,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
fi
|
||||
AC_MSG_RESULT($SHLIB_SUFFIX)
|
||||
|
||||
@@ -3272,6 +3275,12 @@
|
||||
@@ -3397,6 +3400,12 @@
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
@@ -24,7 +24,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
fi
|
||||
AC_MSG_RESULT($DYNLOADFILE)
|
||||
if test "$DYNLOADFILE" != "dynload_stub.o"
|
||||
@@ -4519,6 +4528,12 @@
|
||||
@@ -4644,6 +4653,12 @@
|
||||
*)
|
||||
EXT_SUFFIX=${SHLIB_SUFFIX};;
|
||||
esac
|
||||
@@ -37,10 +37,10 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
|
||||
AC_MSG_CHECKING(LDVERSION)
|
||||
LDVERSION='$(VERSION)$(ABIFLAGS)'
|
||||
diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:41:26.014247900 +0300
|
||||
+++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:41:28.746974600 +0300
|
||||
@@ -763,6 +763,12 @@
|
||||
diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in
|
||||
--- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:21:05.319800700 +0300
|
||||
+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:21:09.366300700 +0300
|
||||
@@ -789,6 +789,12 @@
|
||||
-DSHLIB_EXT='"$(EXT_SUFFIX)"' \
|
||||
-o $@ $(srcdir)/Python/dynload_hpux.c
|
||||
|
||||
@@ -53,9 +53,9 @@ diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile
|
||||
$(CC) -c $(PY_CORE_CFLAGS) \
|
||||
-DABIFLAGS='"$(ABIFLAGS)"' \
|
||||
diff -Naur Python-3.5.0-orig/Python/dynload_win.c Python-3.5.0/Python/dynload_win.c
|
||||
--- Python-3.5.0-orig/Python/dynload_win.c 2015-09-13 14:41:26.000000000 +0300
|
||||
+++ Python-3.5.0/Python/dynload_win.c 2015-09-21 13:41:28.760973200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Python/dynload_win.c Python-3.5.2/Python/dynload_win.c
|
||||
--- Python-3.5.2-orig/Python/dynload_win.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Python/dynload_win.c 2016-07-12 14:21:09.386300700 +0300
|
||||
@@ -35,11 +35,21 @@
|
||||
#define PYD_UNTAGGED_SUFFIX PYD_DEBUG_SUFFIX ".pyd"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
--- Python-3.5.0-orig/PC/getpathp.c 2015-09-21 13:41:19.698879500 +0300
|
||||
+++ Python-3.5.0/PC/getpathp.c 2015-09-21 13:41:30.111838100 +0300
|
||||
diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c
|
||||
--- Python-3.5.2-orig/PC/getpathp.c 2016-07-12 14:20:55.989800700 +0300
|
||||
+++ Python-3.5.2/PC/getpathp.c 2016-07-12 14:21:11.286800700 +0300
|
||||
@@ -104,10 +104,17 @@
|
||||
|
||||
# define USE_POSIX_PREFIX
|
||||
@@ -102,7 +102,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
|
||||
/* Load a PYTHONPATH value from the registry.
|
||||
Load from either HKEY_LOCAL_MACHINE or HKEY_CURRENT_USER.
|
||||
@@ -570,6 +653,9 @@
|
||||
@@ -573,6 +656,9 @@
|
||||
#ifdef USE_POSIX_PREFIX
|
||||
int pfound;
|
||||
#endif
|
||||
@@ -112,7 +112,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
|
||||
#ifdef MS_WINDOWS
|
||||
int skiphome, skipdefault;
|
||||
@@ -665,6 +751,16 @@
|
||||
@@ -668,6 +754,16 @@
|
||||
if (envpath && *envpath == '\0')
|
||||
envpath = NULL;
|
||||
|
||||
@@ -129,7 +129,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
#ifdef MS_WINDOWS
|
||||
/* Calculate zip archive path from DLL or exe path */
|
||||
if (wcscpy_s(zip_path, MAXPATHLEN+1, dllpath[0] ? dllpath : progpath))
|
||||
@@ -719,6 +815,9 @@
|
||||
@@ -722,6 +818,9 @@
|
||||
#ifdef USE_POSIX_PREFIX
|
||||
bufsz += wcslen(prefix) + 1;
|
||||
#endif
|
||||
@@ -139,7 +139,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
bufsz += wcslen(PYTHONPATH) + 1;
|
||||
bufsz += wcslen(argv0_path) + 1;
|
||||
#ifdef MS_WINDOWS
|
||||
@@ -768,6 +867,11 @@
|
||||
@@ -771,6 +870,11 @@
|
||||
buf = wcschr(buf, L'\0');
|
||||
*buf++ = DELIM;
|
||||
#endif
|
||||
@@ -151,7 +151,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
if (userpath) {
|
||||
if (wcscpy_s(buf, bufsz - (buf - module_search_path), userpath))
|
||||
Py_FatalError("buffer overflow in getpathp.c's calculate_path()");
|
||||
@@ -841,6 +945,17 @@
|
||||
@@ -844,6 +948,17 @@
|
||||
reduce(prefix);
|
||||
reduce(prefix);
|
||||
}
|
||||
@@ -169,7 +169,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
#endif
|
||||
if (*prefix==L'\0') {
|
||||
wchar_t lookBuf[MAXPATHLEN+1];
|
||||
@@ -910,7 +1025,13 @@
|
||||
@@ -913,7 +1028,13 @@
|
||||
wchar_t *
|
||||
Py_GetExecPrefix(void)
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:29.960853200 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:31.365712700 +0300
|
||||
@@ -5165,6 +5165,16 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:21:10.955300700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:21:13.172300700 +0300
|
||||
@@ -5295,6 +5295,16 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -18,10 +18,10 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
AC_SUBST(SRCDIRS)
|
||||
SRCDIRS="Parser Grammar Objects Python Modules Mac Programs"
|
||||
case $host in
|
||||
diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:41:29.981851100 +0300
|
||||
+++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:41:31.372712000 +0300
|
||||
@@ -370,7 +370,7 @@
|
||||
diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in
|
||||
--- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:21:10.970800700 +0300
|
||||
+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:21:13.220800700 +0300
|
||||
@@ -377,7 +377,7 @@
|
||||
Python/codecs.o \
|
||||
Python/dynamic_annotations.o \
|
||||
Python/errors.o \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:27.356113700 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:41:32.656583600 +0300
|
||||
@@ -1270,7 +1270,7 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:21:07.246800700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:21:15.117800700 +0300
|
||||
@@ -1296,7 +1296,7 @@
|
||||
missing.append('_gdbm')
|
||||
|
||||
# Unix-only modules
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:33.783470900 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:41:33.895459700 +0300
|
||||
@@ -1532,7 +1532,7 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:21:16.644300700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:21:16.924800700 +0300
|
||||
@@ -1558,7 +1558,7 @@
|
||||
macros = dict()
|
||||
libraries = ['rt']
|
||||
|
||||
@@ -10,7 +10,7 @@ diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
|
||||
'_multiprocessing/semaphore.c',
|
||||
]
|
||||
@@ -1545,8 +1545,12 @@
|
||||
@@ -1571,8 +1571,12 @@
|
||||
multiprocessing_srcs.append('_multiprocessing/semaphore.c')
|
||||
|
||||
if sysconfig.get_config_var('WITH_THREAD'):
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Modules/selectmodule.c Python-3.5.0/Modules/selectmodule.c
|
||||
--- Python-3.5.0-orig/Modules/selectmodule.c 2015-09-13 14:41:25.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/selectmodule.c 2015-09-21 13:41:35.081341100 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/selectmodule.c Python-3.5.2/Modules/selectmodule.c
|
||||
--- Python-3.5.2-orig/Modules/selectmodule.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/selectmodule.c 2016-07-12 14:21:18.701800700 +0300
|
||||
@@ -102,9 +102,9 @@
|
||||
v = PyObject_AsFileDescriptor( o );
|
||||
if (v == -1) goto finally;
|
||||
@@ -22,10 +22,10 @@ diff -Naur Python-3.5.0-orig/Modules/selectmodule.c Python-3.5.0/Modules/selectm
|
||||
FD_SET(v, set);
|
||||
|
||||
/* add object and its file descriptor to the list */
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:34.983350900 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:41:35.087340500 +0300
|
||||
@@ -654,7 +654,11 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:21:18.450300700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:21:18.715800700 +0300
|
||||
@@ -681,7 +681,11 @@
|
||||
missing.append('spwd')
|
||||
|
||||
# select(2); not on ancient System V
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Modules/_ctypes/callproc.c Python-3.5.0/Modules/_ctypes/callproc.c
|
||||
--- Python-3.5.0-orig/Modules/_ctypes/callproc.c 2015-09-13 14:41:24.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/_ctypes/callproc.c 2015-09-21 13:41:36.375211700 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/_ctypes/callproc.c Python-3.5.2/Modules/_ctypes/callproc.c
|
||||
--- Python-3.5.2-orig/Modules/_ctypes/callproc.c 2016-06-26 00:38:37.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/_ctypes/callproc.c 2016-07-12 14:21:20.616800700 +0300
|
||||
@@ -727,6 +727,21 @@
|
||||
}
|
||||
|
||||
@@ -59,19 +59,19 @@ diff -Naur Python-3.5.0-orig/Modules/_ctypes/callproc.c Python-3.5.0/Modules/_ct
|
||||
#endif
|
||||
if ((flags & FUNCFLAG_PYTHONAPI) && PyErr_Occurred())
|
||||
return -1;
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:36.271222100 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:41:36.381211100 +0300
|
||||
@@ -1960,6 +1960,8 @@
|
||||
depends=depends)
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:21:20.319800700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:21:20.629800700 +0300
|
||||
@@ -1989,6 +1989,8 @@
|
||||
ext_test = Extension('_ctypes_test',
|
||||
sources=['_ctypes/_ctypes_test.c'])
|
||||
sources=['_ctypes/_ctypes_test.c'],
|
||||
libraries=math_libs)
|
||||
+ if host_platform.startswith(('mingw', 'win')):
|
||||
+ ext_test.libraries.extend(['oleaut32'])
|
||||
self.extensions.extend([ext, ext_test])
|
||||
|
||||
if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
|
||||
@@ -1993,6 +1995,8 @@
|
||||
@@ -2022,6 +2024,8 @@
|
||||
if ffi_inc and ffi_lib:
|
||||
ext.include_dirs.extend(ffi_inc)
|
||||
ext.libraries.append(ffi_lib)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:32.537595500 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:37.654083800 +0300
|
||||
@@ -3834,21 +3834,36 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:21:14.815300700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:21:22.576300700 +0300
|
||||
@@ -3959,21 +3959,36 @@
|
||||
],[])
|
||||
AC_MSG_RESULT($was_it_defined)
|
||||
|
||||
@@ -42,7 +42,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
[ac_cv_struct_sockaddr_storage=yes],
|
||||
[ac_cv_struct_sockaddr_storage=no]))
|
||||
AC_MSG_RESULT($ac_cv_struct_sockaddr_storage)
|
||||
@@ -5051,7 +5066,10 @@
|
||||
@@ -5181,7 +5196,10 @@
|
||||
|
||||
AC_CHECK_TYPE(socklen_t,,
|
||||
AC_DEFINE(socklen_t,int,
|
||||
@@ -54,9 +54,9 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
diff -Naur Python-3.5.0-orig/Misc/config_mingw Python-3.5.0/Misc/config_mingw
|
||||
--- Python-3.5.0-orig/Misc/config_mingw 2015-09-21 13:41:09.276921800 +0300
|
||||
+++ Python-3.5.0/Misc/config_mingw 2015-09-21 13:41:37.660083200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Misc/config_mingw Python-3.5.2/Misc/config_mingw
|
||||
--- Python-3.5.2-orig/Misc/config_mingw 2016-07-12 14:20:40.379300700 +0300
|
||||
+++ Python-3.5.2/Misc/config_mingw 2016-07-12 14:21:22.583300700 +0300
|
||||
@@ -10,3 +10,6 @@
|
||||
# files to ignore
|
||||
ac_cv_file__dev_ptmx=ignore #NOTE: under MSYS environment device exist
|
||||
@@ -64,10 +64,10 @@ diff -Naur Python-3.5.0-orig/Misc/config_mingw Python-3.5.0/Misc/config_mingw
|
||||
+
|
||||
+# force detection of winsock2 functionality - require wxp or newer
|
||||
+ac_cv_func_getpeername=yes
|
||||
diff -Naur Python-3.5.0-orig/Modules/socketmodule.c Python-3.5.0/Modules/socketmodule.c
|
||||
--- Python-3.5.0-orig/Modules/socketmodule.c 2015-09-13 14:41:25.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/socketmodule.c 2015-09-21 13:41:37.675081700 +0300
|
||||
@@ -307,6 +307,12 @@
|
||||
diff -Naur Python-3.5.2-orig/Modules/socketmodule.c Python-3.5.2/Modules/socketmodule.c
|
||||
--- Python-3.5.2-orig/Modules/socketmodule.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/socketmodule.c 2016-07-12 14:21:22.593300700 +0300
|
||||
@@ -329,6 +329,12 @@
|
||||
/* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and
|
||||
* EAI_* constants are defined in (the already included) ws2tcpip.h.
|
||||
*/
|
||||
@@ -80,9 +80,9 @@ diff -Naur Python-3.5.0-orig/Modules/socketmodule.c Python-3.5.0/Modules/socketm
|
||||
#else
|
||||
# include "addrinfo.h"
|
||||
#endif
|
||||
diff -Naur Python-3.5.0-orig/pyconfig.h.in Python-3.5.0/pyconfig.h.in
|
||||
--- Python-3.5.0-orig/pyconfig.h.in 2015-09-21 13:41:15.600289400 +0300
|
||||
+++ Python-3.5.0/pyconfig.h.in 2015-09-21 13:41:37.697079500 +0300
|
||||
diff -Naur Python-3.5.2-orig/pyconfig.h.in Python-3.5.2/pyconfig.h.in
|
||||
--- Python-3.5.2-orig/pyconfig.h.in 2016-07-12 14:20:50.003800700 +0300
|
||||
+++ Python-3.5.2/pyconfig.h.in 2016-07-12 14:21:22.624800700 +0300
|
||||
@@ -43,7 +43,7 @@
|
||||
/* Define to 1 if you have the `acosh' function. */
|
||||
#undef HAVE_ACOSH
|
||||
@@ -92,7 +92,7 @@ diff -Naur Python-3.5.0-orig/pyconfig.h.in Python-3.5.0/pyconfig.h.in
|
||||
#undef HAVE_ADDRINFO
|
||||
|
||||
/* Define to 1 if you have the `alarm' function. */
|
||||
@@ -1176,6 +1176,9 @@
|
||||
@@ -1181,6 +1181,9 @@
|
||||
/* Define to 1 if you have the `writev' function. */
|
||||
#undef HAVE_WRITEV
|
||||
|
||||
@@ -102,7 +102,7 @@ diff -Naur Python-3.5.0-orig/pyconfig.h.in Python-3.5.0/pyconfig.h.in
|
||||
/* Define if the zlib library has inflateCopy */
|
||||
#undef HAVE_ZLIB_COPY
|
||||
|
||||
@@ -1508,7 +1511,7 @@
|
||||
@@ -1513,7 +1516,7 @@
|
||||
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
||||
#undef size_t
|
||||
|
||||
@@ -111,10 +111,10 @@ diff -Naur Python-3.5.0-orig/pyconfig.h.in Python-3.5.0/pyconfig.h.in
|
||||
#undef socklen_t
|
||||
|
||||
/* Define to `int' if <sys/types.h> doesn't define. */
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:37.554093800 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:41:37.705078700 +0300
|
||||
@@ -782,7 +782,11 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:21:22.229300700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:21:22.658300700 +0300
|
||||
@@ -812,7 +812,11 @@
|
||||
exts.append( Extension('_posixsubprocess', ['_posixsubprocess.c']) )
|
||||
|
||||
# socket(2)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:38.945954600 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:41:39.052943900 +0300
|
||||
@@ -641,11 +641,20 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:21:24.401800700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:21:24.724300700 +0300
|
||||
@@ -668,11 +668,20 @@
|
||||
if (config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)):
|
||||
# May be necessary on AIX for flock function
|
||||
libs = ['bsd']
|
||||
@@ -25,7 +25,7 @@ diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
# spwd, shadow passwords
|
||||
if (config_h_vars.get('HAVE_GETSPNAM', False) or
|
||||
config_h_vars.get('HAVE_GETSPENT', False)):
|
||||
@@ -668,7 +677,10 @@
|
||||
@@ -695,7 +704,10 @@
|
||||
|
||||
# Lance Ellinghaus's syslog module
|
||||
# syslog daemon interface
|
||||
@@ -37,7 +37,7 @@ diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
|
||||
#
|
||||
# Here ends the simple stuff. From here on, modules need certain
|
||||
@@ -769,17 +781,23 @@
|
||||
@@ -799,17 +811,23 @@
|
||||
|
||||
# crypt module.
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Modules/_winapi.c Python-3.5.0/Modules/_winapi.c
|
||||
--- Python-3.5.0-orig/Modules/_winapi.c 2015-09-13 14:41:24.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/_winapi.c 2015-09-21 13:41:40.316817500 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/_winapi.c Python-3.5.2/Modules/_winapi.c
|
||||
--- Python-3.5.2-orig/Modules/_winapi.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/_winapi.c 2016-07-12 14:21:26.535300700 +0300
|
||||
@@ -39,7 +39,9 @@
|
||||
|
||||
#define WINDOWS_LEAN_AND_MEAN
|
||||
@@ -11,9 +11,9 @@ diff -Naur Python-3.5.0-orig/Modules/_winapi.c Python-3.5.0/Modules/_winapi.c
|
||||
#include "winreparse.h"
|
||||
|
||||
#if defined(MS_WIN32) && !defined(MS_WIN64)
|
||||
diff -Naur Python-3.5.0-orig/PC/msvcrtmodule.c Python-3.5.0/PC/msvcrtmodule.c
|
||||
--- Python-3.5.0-orig/PC/msvcrtmodule.c 2015-09-13 14:41:25.000000000 +0300
|
||||
+++ Python-3.5.0/PC/msvcrtmodule.c 2015-09-21 13:41:40.329816200 +0300
|
||||
diff -Naur Python-3.5.2-orig/PC/msvcrtmodule.c Python-3.5.2/PC/msvcrtmodule.c
|
||||
--- Python-3.5.2-orig/PC/msvcrtmodule.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/PC/msvcrtmodule.c 2016-07-12 14:21:26.546800700 +0300
|
||||
@@ -21,7 +21,9 @@
|
||||
#include <io.h>
|
||||
#include <conio.h>
|
||||
@@ -24,10 +24,10 @@ diff -Naur Python-3.5.0-orig/PC/msvcrtmodule.c Python-3.5.0/PC/msvcrtmodule.c
|
||||
#include <windows.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:40.205828600 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:41:40.342814900 +0300
|
||||
@@ -907,6 +907,24 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:21:26.253300700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:21:26.561300700 +0300
|
||||
@@ -937,6 +937,24 @@
|
||||
min_db_ver = (3, 3)
|
||||
db_setup_debug = False # verbose debug prints from this script?
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/command/build_ext.py Python-3.5.0/Lib/distutils/command/build_ext.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/command/build_ext.py 2015-09-13 14:41:20.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/command/build_ext.py 2015-09-21 13:41:41.616687500 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/command/build_ext.py Python-3.5.2/Lib/distutils/command/build_ext.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/command/build_ext.py 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/command/build_ext.py 2016-07-12 14:21:28.374300700 +0300
|
||||
@@ -184,7 +184,7 @@
|
||||
# for extensions under windows use different directories
|
||||
# for Release and Debug builds.
|
||||
@@ -31,9 +31,9 @@ diff -Naur Python-3.5.0-orig/Lib/distutils/command/build_ext.py Python-3.5.0/Lib
|
||||
if sys.platform == "win32":
|
||||
from distutils._msvccompiler import MSVCCompiler
|
||||
if not isinstance(self.compiler, MSVCCompiler):
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/util.py Python-3.5.0/Lib/distutils/util.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/util.py 2015-09-13 14:41:21.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/util.py 2015-09-21 13:41:41.633685800 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/util.py Python-3.5.2/Lib/distutils/util.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/util.py 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/util.py 2016-07-12 14:21:28.380800700 +0300
|
||||
@@ -40,6 +40,8 @@
|
||||
For other non-POSIX platforms, currently just returns 'sys.platform'.
|
||||
"""
|
||||
@@ -43,10 +43,10 @@ diff -Naur Python-3.5.0-orig/Lib/distutils/util.py Python-3.5.0/Lib/distutils/ut
|
||||
# sniff sys.version for architecture.
|
||||
prefix = " bit ("
|
||||
i = sys.version.find(prefix)
|
||||
diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py
|
||||
--- Python-3.5.0-orig/Lib/sysconfig.py 2015-09-21 13:41:04.093440200 +0300
|
||||
+++ Python-3.5.0/Lib/sysconfig.py 2015-09-21 13:41:41.638685300 +0300
|
||||
@@ -622,6 +622,8 @@
|
||||
diff -Naur Python-3.5.2-orig/Lib/sysconfig.py Python-3.5.2/Lib/sysconfig.py
|
||||
--- Python-3.5.2-orig/Lib/sysconfig.py 2016-07-12 14:20:30.962800700 +0300
|
||||
+++ Python-3.5.2/Lib/sysconfig.py 2016-07-12 14:21:28.412800700 +0300
|
||||
@@ -627,6 +627,8 @@
|
||||
For other non-POSIX platforms, currently just returns 'sys.platform'.
|
||||
"""
|
||||
if os.name == 'nt':
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/ccompiler.py Python-3.5.0/Lib/distutils/ccompiler.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/ccompiler.py 2015-09-13 14:41:20.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/ccompiler.py 2015-09-21 13:41:42.896559500 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/ccompiler.py Python-3.5.2/Lib/distutils/ccompiler.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/ccompiler.py 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/ccompiler.py 2016-07-12 14:21:30.454800700 +0300
|
||||
@@ -9,7 +9,7 @@
|
||||
from distutils.file_util import move_file
|
||||
from distutils.dir_util import mkpath
|
||||
@@ -19,9 +19,9 @@ diff -Naur Python-3.5.0-orig/Lib/distutils/ccompiler.py Python-3.5.0/Lib/distuti
|
||||
for pattern, compiler in _default_compilers:
|
||||
if re.match(pattern, platform) is not None or \
|
||||
re.match(pattern, osname) is not None:
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py 2015-09-13 14:41:21.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/cygwinccompiler.py 2015-09-21 13:41:42.902558900 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/cygwinccompiler.py Python-3.5.2/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/cygwinccompiler.py 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/cygwinccompiler.py 2016-07-12 14:21:30.471300700 +0300
|
||||
@@ -255,11 +255,16 @@
|
||||
output_dir = ''
|
||||
obj_names = []
|
||||
@@ -49,4 +49,4 @@ diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/d
|
||||
+ self.dll_libraries = get_msvcr() or []
|
||||
|
||||
# Because these compilers aren't configured in Python's pyconfig.h file by
|
||||
# default, we should at least warn the user if he is using a unmodified
|
||||
# default, we should at least warn the user if he is using an unmodified
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py 2015-09-21 13:41:44.031446000 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/cygwinccompiler.py 2015-09-21 13:41:44.133435800 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/cygwinccompiler.py Python-3.5.2/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/cygwinccompiler.py 2016-07-12 14:21:32.060800700 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/cygwinccompiler.py 2016-07-12 14:21:32.300300700 +0300
|
||||
@@ -93,6 +93,7 @@
|
||||
obj_extension = ".o"
|
||||
static_lib_extension = ".a"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:41.508698300 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:41:45.377311400 +0300
|
||||
@@ -826,10 +826,13 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:21:28.099300700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:21:34.084800700 +0300
|
||||
@@ -856,10 +856,13 @@
|
||||
|
||||
if (ssl_incs is not None and
|
||||
ssl_libs is not None):
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py
|
||||
--- Python-3.5.0-orig/Lib/sysconfig.py 2015-09-21 13:41:42.792569900 +0300
|
||||
+++ Python-3.5.0/Lib/sysconfig.py 2015-09-21 13:41:46.638185300 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/sysconfig.py Python-3.5.2/Lib/sysconfig.py
|
||||
--- Python-3.5.2-orig/Lib/sysconfig.py 2016-07-12 14:21:30.115300700 +0300
|
||||
+++ Python-3.5.2/Lib/sysconfig.py 2016-07-12 14:21:35.809300700 +0300
|
||||
@@ -95,6 +95,9 @@
|
||||
_CONFIG_VARS = None
|
||||
_USER_BASE = None
|
||||
@@ -29,7 +29,7 @@ diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py
|
||||
base = os.environ.get("APPDATA") or "~"
|
||||
if env_base:
|
||||
return env_base
|
||||
@@ -468,7 +471,7 @@
|
||||
@@ -473,7 +476,7 @@
|
||||
def get_config_h_filename():
|
||||
"""Return the path of pyconfig.h."""
|
||||
if _PYTHON_BUILD:
|
||||
@@ -38,7 +38,7 @@ diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py
|
||||
inc_dir = os.path.join(_sys_home or _PROJECT_BASE, "PC")
|
||||
else:
|
||||
inc_dir = _sys_home or _PROJECT_BASE
|
||||
@@ -539,9 +542,9 @@
|
||||
@@ -544,9 +547,9 @@
|
||||
# sys.abiflags may not be defined on all platforms.
|
||||
_CONFIG_VARS['abiflags'] = ''
|
||||
|
||||
@@ -50,7 +50,7 @@ diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py
|
||||
_init_posix(_CONFIG_VARS)
|
||||
# For backward compatibility, see issue19555
|
||||
SO = _CONFIG_VARS.get('EXT_SUFFIX')
|
||||
@@ -554,7 +557,7 @@
|
||||
@@ -559,7 +562,7 @@
|
||||
|
||||
# Always convert srcdir to an absolute path
|
||||
srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/Modules/_ctypes/_ctypes.c Python-3.5.0/Modules/_ctypes/_ctypes.c
|
||||
--- Python-3.5.0-orig/Modules/_ctypes/_ctypes.c 2015-09-13 14:41:24.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/_ctypes/_ctypes.c 2015-09-21 13:41:47.943054800 +0300
|
||||
@@ -3085,11 +3085,28 @@
|
||||
diff -Naur Python-3.5.2-orig/Modules/_ctypes/_ctypes.c Python-3.5.2/Modules/_ctypes/_ctypes.c
|
||||
--- Python-3.5.2-orig/Modules/_ctypes/_ctypes.c 2016-06-26 00:38:37.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/_ctypes/_ctypes.c 2016-07-12 14:21:37.622800700 +0300
|
||||
@@ -3092,11 +3092,28 @@
|
||||
mangled_name = alloca(strlen(name) + 1 + 1 + 1 + 3); /* \0 _ @ %d */
|
||||
if (!mangled_name)
|
||||
return NULL;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:46.528196300 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:41:49.175931500 +0300
|
||||
@@ -2239,7 +2239,7 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:21:35.548300700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:21:39.523300700 +0300
|
||||
@@ -2268,7 +2268,7 @@
|
||||
else:
|
||||
newfilename = filename + minoronly
|
||||
log.info('renaming {} to {}'.format(filename, newfilename))
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py 2015-09-21 13:41:45.246324500 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/cygwinccompiler.py 2015-09-21 13:41:50.481800900 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/cygwinccompiler.py Python-3.5.2/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/cygwinccompiler.py 2016-07-12 14:21:33.833800700 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/cygwinccompiler.py 2016-07-12 14:21:41.350300700 +0300
|
||||
@@ -48,7 +48,6 @@
|
||||
import os
|
||||
import sys
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/sysconfig.py Python-3.5.0/Lib/distutils/sysconfig.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/sysconfig.py 2015-09-21 13:41:23.499499400 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/sysconfig.py 2015-09-21 13:41:51.721676900 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/sysconfig.py Python-3.5.2/Lib/distutils/sysconfig.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/sysconfig.py 2016-07-12 14:21:01.532300700 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/sysconfig.py 2016-07-12 14:21:43.216300700 +0300
|
||||
@@ -53,6 +53,17 @@
|
||||
return _is_python_source_dir(project_base)
|
||||
python_build = _python_build()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/site.py Python-3.5.0/Lib/site.py
|
||||
--- Python-3.5.0-orig/Lib/site.py 2015-09-13 14:41:21.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/site.py 2015-09-21 13:41:52.913557700 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/site.py Python-3.5.2/Lib/site.py
|
||||
--- Python-3.5.2-orig/Lib/site.py 2016-06-26 00:38:36.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/site.py 2016-07-12 14:21:44.968800700 +0300
|
||||
@@ -267,6 +267,12 @@
|
||||
USER_SITE = get_path('purelib', 'osx_framework_user')
|
||||
return USER_SITE
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Misc/python-config.sh.in Python-3.5.0/Misc/python-config.sh.in
|
||||
--- Python-3.5.0-orig/Misc/python-config.sh.in 2015-09-13 14:41:24.000000000 +0300
|
||||
+++ Python-3.5.0/Misc/python-config.sh.in 2015-09-21 13:41:54.198429200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Misc/python-config.sh.in Python-3.5.2/Misc/python-config.sh.in
|
||||
--- Python-3.5.2-orig/Misc/python-config.sh.in 2016-06-26 00:38:37.000000000 +0300
|
||||
+++ Python-3.5.2/Misc/python-config.sh.in 2016-07-12 14:21:46.795800700 +0300
|
||||
@@ -1,25 +1,37 @@
|
||||
#!/bin/sh
|
||||
|
||||
@@ -77,7 +77,7 @@ diff -Naur Python-3.5.0-orig/Misc/python-config.sh.in Python-3.5.0/Misc/python-c
|
||||
+LINKFORSHARED="@LINKFORSHARED@"
|
||||
LIBDEST=${prefix}/lib/python${VERSION}
|
||||
LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
|
||||
SO="@SO@"
|
||||
SO="@EXT_SUFFIX@"
|
||||
@@ -59,33 +74,33 @@
|
||||
do
|
||||
case $ARG in
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:38.885960600 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:55.469158400 +0300
|
||||
@@ -374,6 +374,7 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:21:24.320800700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:21:48.591800700 +0300
|
||||
@@ -375,6 +375,7 @@
|
||||
then
|
||||
# avoid using uname for cross builds
|
||||
if test "$cross_compiling" = yes; then
|
||||
@@ -9,7 +9,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
# ac_sys_system and ac_sys_release are used for setting
|
||||
# a lot of different things including 'define_xopen_source'
|
||||
# in the case statement below.
|
||||
@@ -384,12 +385,32 @@
|
||||
@@ -385,12 +386,32 @@
|
||||
*-*-cygwin*)
|
||||
ac_sys_system=Cygwin
|
||||
;;
|
||||
@@ -43,7 +43,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
else
|
||||
ac_sys_system=`uname -s`
|
||||
if test "$ac_sys_system" = "AIX" \
|
||||
@@ -432,6 +453,9 @@
|
||||
@@ -433,6 +454,9 @@
|
||||
*-*-mingw*)
|
||||
_host_cpu=
|
||||
;;
|
||||
@@ -53,7 +53,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
*)
|
||||
# for now, limit cross builds to known configurations
|
||||
MACHDEP="unknown"
|
||||
@@ -1347,6 +1371,26 @@
|
||||
@@ -1447,6 +1471,26 @@
|
||||
AC_SUBST(BASECFLAGS)
|
||||
AC_SUBST(CFLAGS_NODIST)
|
||||
|
||||
@@ -80,7 +80,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
# The -arch flags for universal builds on OSX
|
||||
UNIVERSAL_ARCH_FLAGS=
|
||||
AC_SUBST(UNIVERSAL_ARCH_FLAGS)
|
||||
@@ -1592,7 +1636,7 @@
|
||||
@@ -1710,7 +1754,7 @@
|
||||
;;
|
||||
esac
|
||||
else
|
||||
@@ -89,7 +89,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
then
|
||||
# 10.4 was the first release to support Intel archs
|
||||
cur_target="10.4"
|
||||
@@ -2163,7 +2207,7 @@
|
||||
@@ -2288,7 +2332,7 @@
|
||||
if test "${enable_universalsdk}"; then
|
||||
:
|
||||
else
|
||||
@@ -98,21 +98,21 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
fi
|
||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
|
||||
@@ -2188,7 +2232,7 @@
|
||||
@@ -2313,7 +2357,7 @@
|
||||
]])],[ac_osx_32bit=yes],[ac_osx_32bit=no],[ac_osx_32bit=yes])
|
||||
|
||||
|
||||
if test "${ac_osx_32bit}" = "yes"; then
|
||||
- case `/usr/bin/arch` in
|
||||
+ case $($ARCH_PROG) in
|
||||
i386)
|
||||
MACOSX_DEFAULT_ARCH="i386"
|
||||
i386)
|
||||
MACOSX_DEFAULT_ARCH="i386"
|
||||
;;
|
||||
@@ -2200,7 +2244,7 @@
|
||||
@@ -2325,7 +2369,7 @@
|
||||
;;
|
||||
esac
|
||||
else
|
||||
- case `/usr/bin/arch` in
|
||||
+ case $($ARCH_PROG) in
|
||||
i386)
|
||||
MACOSX_DEFAULT_ARCH="x86_64"
|
||||
i386)
|
||||
MACOSX_DEFAULT_ARCH="x86_64"
|
||||
;;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:56.872256800 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:41:56.988523200 +0300
|
||||
@@ -1896,7 +1896,7 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:21:50.147800700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:21:50.471800700 +0300
|
||||
@@ -2021,7 +2021,7 @@
|
||||
AC_HEADER_STDC
|
||||
AC_CHECK_HEADERS(asm/types.h conio.h direct.h dlfcn.h errno.h \
|
||||
fcntl.h grp.h \
|
||||
@@ -10,7 +10,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
sched.h shadow.h signal.h stdint.h stropts.h termios.h \
|
||||
unistd.h utime.h \
|
||||
poll.h sys/devpoll.h sys/epoll.h sys/poll.h \
|
||||
@@ -2609,9 +2609,11 @@
|
||||
@@ -2734,9 +2734,11 @@
|
||||
:
|
||||
else
|
||||
if test "$with_threads" = "yes" -o -z "$with_threads"; then
|
||||
@@ -25,7 +25,7 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -4902,6 +4904,14 @@
|
||||
@@ -5032,6 +5034,14 @@
|
||||
|
||||
AC_CHECK_HEADERS(curses.h ncurses.h)
|
||||
|
||||
@@ -40,9 +40,9 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
# On Solaris, term.h requires curses.h
|
||||
AC_CHECK_HEADERS(term.h,,,[
|
||||
#ifdef HAVE_CURSES_H
|
||||
diff -Naur Python-3.5.0-orig/Python/condvar.h Python-3.5.0/Python/condvar.h
|
||||
--- Python-3.5.0-orig/Python/condvar.h 2015-09-13 14:41:26.000000000 +0300
|
||||
+++ Python-3.5.0/Python/condvar.h 2015-09-21 13:41:56.995296000 +0300
|
||||
diff -Naur Python-3.5.2-orig/Python/condvar.h Python-3.5.2/Python/condvar.h
|
||||
--- Python-3.5.2-orig/Python/condvar.h 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Python/condvar.h 2016-07-12 14:21:50.487300700 +0300
|
||||
@@ -42,6 +42,12 @@
|
||||
|
||||
#include "Python.h"
|
||||
@@ -56,9 +56,9 @@ diff -Naur Python-3.5.0-orig/Python/condvar.h Python-3.5.0/Python/condvar.h
|
||||
#ifndef _POSIX_THREADS
|
||||
/* This means pthreads are not implemented in libc headers, hence the macro
|
||||
not present in unistd.h. But they still can be implemented as an external
|
||||
diff -Naur Python-3.5.0-orig/Python/thread.c Python-3.5.0/Python/thread.c
|
||||
--- Python-3.5.0-orig/Python/thread.c 2015-09-13 14:41:26.000000000 +0300
|
||||
+++ Python-3.5.0/Python/thread.c 2015-09-21 13:41:57.011099200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Python/thread.c Python-3.5.2/Python/thread.c
|
||||
--- Python-3.5.2-orig/Python/thread.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Python/thread.c 2016-07-12 14:21:50.495800700 +0300
|
||||
@@ -7,6 +7,12 @@
|
||||
|
||||
#include "Python.h"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Modules/_ctypes/libffi/fficonfig.py.in Python-3.5.0/Modules/_ctypes/libffi/fficonfig.py.in
|
||||
--- Python-3.5.0-orig/Modules/_ctypes/libffi/fficonfig.py.in 2015-09-13 14:41:24.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/_ctypes/libffi/fficonfig.py.in 2015-09-21 13:41:58.520304800 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/_ctypes/libffi/fficonfig.py.in Python-3.5.2/Modules/_ctypes/libffi/fficonfig.py.in
|
||||
--- Python-3.5.2-orig/Modules/_ctypes/libffi/fficonfig.py.in 2016-06-26 00:38:37.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/_ctypes/libffi/fficonfig.py.in 2016-07-12 14:21:52.330800700 +0300
|
||||
@@ -23,6 +23,7 @@
|
||||
'FRV': ['src/frv/eabi.S', 'src/frv/ffi.c'],
|
||||
'S390': ['src/s390/sysv.S', 'src/s390/ffi.c'],
|
||||
@@ -19,10 +19,10 @@ diff -Naur Python-3.5.0-orig/Modules/_ctypes/libffi/fficonfig.py.in Python-3.5.0
|
||||
ffi_sources += ffi_platforms['@TARGET@']
|
||||
|
||||
ffi_cflags = '@CFLAGS@'
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:50.381810900 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:41:58.521433600 +0300
|
||||
@@ -1908,6 +1908,10 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:21:41.084800700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:21:52.349800700 +0300
|
||||
@@ -1934,6 +1934,10 @@
|
||||
return True
|
||||
|
||||
def configure_ctypes(self, ext):
|
||||
@@ -33,7 +33,7 @@ diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
if not self.use_system_libffi:
|
||||
if host_platform == 'darwin':
|
||||
return self.configure_ctypes_darwin(ext)
|
||||
@@ -1932,6 +1936,10 @@
|
||||
@@ -1958,6 +1962,10 @@
|
||||
if not self.verbose:
|
||||
config_args.append("-q")
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:58.367916800 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:42:00.039669600 +0300
|
||||
@@ -602,6 +602,16 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:21:52.030300700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:21:54.212300700 +0300
|
||||
@@ -603,6 +603,16 @@
|
||||
fi
|
||||
AC_MSG_RESULT($MACHDEP)
|
||||
|
||||
@@ -18,14 +18,14 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
AC_MSG_CHECKING([for init system calls])
|
||||
AC_SUBST(INITSYS)
|
||||
case $host in
|
||||
diff -Naur Python-3.5.0-orig/Include/osdefs.h Python-3.5.0/Include/osdefs.h
|
||||
--- Python-3.5.0-orig/Include/osdefs.h 2015-09-13 14:41:20.000000000 +0300
|
||||
+++ Python-3.5.0/Include/osdefs.h 2015-09-21 13:42:00.047571200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Include/osdefs.h Python-3.5.2/Include/osdefs.h
|
||||
--- Python-3.5.2-orig/Include/osdefs.h 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Include/osdefs.h 2016-07-12 14:21:54.227300700 +0300
|
||||
@@ -12,6 +12,7 @@
|
||||
#define ALTSEP L'/'
|
||||
#define MAXPATHLEN 256
|
||||
#define DELIM L';'
|
||||
+#define DELIMSTR ";"
|
||||
+#define DELIMSTR L";"
|
||||
#endif
|
||||
|
||||
/* Filename separator */
|
||||
@@ -33,14 +33,14 @@ diff -Naur Python-3.5.0-orig/Include/osdefs.h Python-3.5.0/Include/osdefs.h
|
||||
/* Search path entry delimiter */
|
||||
#ifndef DELIM
|
||||
#define DELIM L':'
|
||||
+#define DELIMSTR ":"
|
||||
+#define DELIMSTR L":"
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:41:32.555593700 +0300
|
||||
+++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:00.074662400 +0300
|
||||
@@ -98,7 +98,8 @@
|
||||
diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in
|
||||
--- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:21:14.824300700 +0300
|
||||
+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:21:54.241300700 +0300
|
||||
@@ -103,7 +103,8 @@
|
||||
# C flags used for building the interpreter object files
|
||||
PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
|
||||
|
||||
@@ -50,21 +50,9 @@ diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
# Machine-dependent subdirectories
|
||||
MACHDEP= @MACHDEP@
|
||||
|
||||
diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
--- Python-3.5.0-orig/Modules/getpath.c 2015-09-13 14:41:24.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/getpath.c 2015-09-21 13:42:00.084821600 +0300
|
||||
@@ -118,7 +118,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef PYTHONPATH
|
||||
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
|
||||
+#define PYTHONPATH PREFIX "/lib/python" VERSION DELIMSTR \
|
||||
EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
|
||||
#endif
|
||||
|
||||
diff -Naur Python-3.5.0-orig/Modules/Setup.dist Python-3.5.0/Modules/Setup.dist
|
||||
--- Python-3.5.0-orig/Modules/Setup.dist 2015-09-21 13:41:18.333016100 +0300
|
||||
+++ Python-3.5.0/Modules/Setup.dist 2015-09-21 13:42:00.091594400 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/Setup.dist Python-3.5.2/Modules/Setup.dist
|
||||
--- Python-3.5.2-orig/Modules/Setup.dist 2016-07-12 14:20:53.918300700 +0300
|
||||
+++ Python-3.5.2/Modules/Setup.dist 2016-07-12 14:21:54.256800700 +0300
|
||||
@@ -84,14 +84,14 @@
|
||||
# Empty since this is now just the runtime prefix.
|
||||
DESTPATH=
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/plat-generic/regen Python-3.5.0/Lib/plat-generic/regen
|
||||
--- Python-3.5.0-orig/Lib/plat-generic/regen 2015-09-13 14:41:21.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/plat-generic/regen 2015-09-21 13:42:01.557905600 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/plat-generic/regen Python-3.5.2/Lib/plat-generic/regen
|
||||
--- Python-3.5.2-orig/Lib/plat-generic/regen 2016-06-26 00:38:36.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/plat-generic/regen 2016-07-12 14:21:56.200300700 +0300
|
||||
@@ -1,3 +1,9 @@
|
||||
#! /bin/sh
|
||||
set -v
|
||||
@@ -12,10 +12,10 @@ diff -Naur Python-3.5.0-orig/Lib/plat-generic/regen Python-3.5.0/Lib/plat-generi
|
||||
+ REGENHEADER=/usr/include/netinet/in.h
|
||||
+fi
|
||||
+eval $PYTHON_FOR_BUILD ../../Tools/scripts/h2py.py -i "'(u_long)'" $REGENHEADER
|
||||
diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:42:01.413419200 +0300
|
||||
+++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:01.563549600 +0300
|
||||
@@ -1322,7 +1322,7 @@
|
||||
diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in
|
||||
--- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:21:55.874300700 +0300
|
||||
+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:21:56.214800700 +0300
|
||||
@@ -1363,7 +1363,7 @@
|
||||
else \
|
||||
PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)"; \
|
||||
fi; \
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Include/pylifecycle.h Python-3.5.0/Include/pylifecycle.h
|
||||
--- Python-3.5.0-orig/Include/pylifecycle.h 2015-09-13 14:41:20.000000000 +0300
|
||||
+++ Python-3.5.0/Include/pylifecycle.h 2015-09-21 13:42:03.010671200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Include/pylifecycle.h Python-3.5.2/Include/pylifecycle.h
|
||||
--- Python-3.5.2-orig/Include/pylifecycle.h 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Include/pylifecycle.h 2016-07-12 14:21:58.192300700 +0300
|
||||
@@ -7,6 +7,12 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
@@ -14,9 +14,9 @@ diff -Naur Python-3.5.0-orig/Include/pylifecycle.h Python-3.5.0/Include/pylifecy
|
||||
PyAPI_FUNC(void) Py_SetProgramName(wchar_t *);
|
||||
PyAPI_FUNC(wchar_t *) Py_GetProgramName(void);
|
||||
|
||||
diff -Naur Python-3.5.0-orig/Lib/ntpath.py Python-3.5.0/Lib/ntpath.py
|
||||
--- Python-3.5.0-orig/Lib/ntpath.py 2015-09-13 14:41:21.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/ntpath.py 2015-09-21 13:42:03.025345600 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/ntpath.py Python-3.5.2/Lib/ntpath.py
|
||||
--- Python-3.5.2-orig/Lib/ntpath.py 2016-06-26 00:38:36.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/ntpath.py 2016-07-12 14:21:58.198800700 +0300
|
||||
@@ -24,9 +24,15 @@
|
||||
curdir = '.'
|
||||
pardir = '..'
|
||||
@@ -35,7 +35,7 @@ diff -Naur Python-3.5.0-orig/Lib/ntpath.py Python-3.5.0/Lib/ntpath.py
|
||||
defpath = '.;C:\\bin'
|
||||
if 'ce' in sys.builtin_module_names:
|
||||
defpath = '\\Windows'
|
||||
@@ -34,9 +38,27 @@
|
||||
@@ -34,9 +40,27 @@
|
||||
|
||||
def _get_bothseps(path):
|
||||
if isinstance(path, bytes):
|
||||
@@ -65,7 +65,7 @@ diff -Naur Python-3.5.0-orig/Lib/ntpath.py Python-3.5.0/Lib/ntpath.py
|
||||
|
||||
# Normalize the case of a pathname and map slashes to backslashes.
|
||||
# Other normalizations (such as optimizing '../' away) are not done
|
||||
@@ -48,9 +52,9 @@
|
||||
@@ -48,9 +72,9 @@
|
||||
Makes all characters lowercase and all slashes into backslashes."""
|
||||
try:
|
||||
if isinstance(s, bytes):
|
||||
@@ -77,7 +77,7 @@ diff -Naur Python-3.5.0-orig/Lib/ntpath.py Python-3.5.0/Lib/ntpath.py
|
||||
except (TypeError, AttributeError):
|
||||
if not isinstance(s, (bytes, str)):
|
||||
raise TypeError("normcase() argument must be str or bytes, "
|
||||
@@ -73,13 +77,8 @@
|
||||
@@ -72,14 +96,9 @@
|
||||
|
||||
# Join two (or more) paths.
|
||||
def join(path, *paths):
|
||||
@@ -94,7 +94,8 @@ diff -Naur Python-3.5.0-orig/Lib/ntpath.py Python-3.5.0/Lib/ntpath.py
|
||||
+ colon = _get_colon(path)
|
||||
try:
|
||||
if not paths:
|
||||
@@ -138,14 +142,9 @@
|
||||
path[:0] + sep #23780: Ensure compatible data type even if p is null.
|
||||
@@ -137,14 +156,9 @@
|
||||
|
||||
"""
|
||||
if len(p) >= 2:
|
||||
@@ -112,7 +113,7 @@ diff -Naur Python-3.5.0-orig/Lib/ntpath.py Python-3.5.0/Lib/ntpath.py
|
||||
normp = p.replace(altsep, sep)
|
||||
if (normp[0:2] == sep*2) and (normp[2:3] != sep):
|
||||
# is a UNC path:
|
||||
@@ -219,9 +223,9 @@
|
||||
@@ -219,9 +233,9 @@
|
||||
|
||||
def splitext(p):
|
||||
if isinstance(p, bytes):
|
||||
@@ -124,7 +125,7 @@ diff -Naur Python-3.5.0-orig/Lib/ntpath.py Python-3.5.0/Lib/ntpath.py
|
||||
splitext.__doc__ = genericpath._splitext.__doc__
|
||||
|
||||
|
||||
@@ -465,15 +469,13 @@
|
||||
@@ -464,15 +478,13 @@
|
||||
|
||||
def normpath(path):
|
||||
"""Normalize path, eliminating double slashes, etc."""
|
||||
@@ -142,7 +143,7 @@ diff -Naur Python-3.5.0-orig/Lib/ntpath.py Python-3.5.0/Lib/ntpath.py
|
||||
curdir = '.'
|
||||
pardir = '..'
|
||||
special_prefixes = ('\\\\.\\', '\\\\?\\')
|
||||
@@ -550,12 +554,11 @@
|
||||
@@ -549,12 +561,11 @@
|
||||
|
||||
def relpath(path, start=None):
|
||||
"""Return a relative version of a path"""
|
||||
@@ -156,7 +157,7 @@ diff -Naur Python-3.5.0-orig/Lib/ntpath.py Python-3.5.0/Lib/ntpath.py
|
||||
curdir = '.'
|
||||
pardir = '..'
|
||||
|
||||
@@ -608,13 +612,11 @@
|
||||
@@ -607,13 +618,11 @@
|
||||
if not paths:
|
||||
raise ValueError('commonpath() arg is an empty sequence')
|
||||
|
||||
@@ -172,10 +173,10 @@ diff -Naur Python-3.5.0-orig/Lib/ntpath.py Python-3.5.0/Lib/ntpath.py
|
||||
curdir = '.'
|
||||
|
||||
try:
|
||||
diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
--- Python-3.5.0-orig/Modules/getpath.c 2015-09-21 13:42:01.429222400 +0300
|
||||
+++ Python-3.5.0/Modules/getpath.c 2015-09-21 13:42:03.044535200 +0300
|
||||
@@ -152,7 +152,7 @@
|
||||
diff -Naur Python-3.5.2-orig/Modules/getpath.c Python-3.5.2/Modules/getpath.c
|
||||
--- Python-3.5.2-orig/Modules/getpath.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/getpath.c 2016-07-12 14:21:58.209800700 +0300
|
||||
@@ -135,7 +135,7 @@
|
||||
reduce(wchar_t *dir)
|
||||
{
|
||||
size_t i = wcslen(dir);
|
||||
@@ -184,7 +185,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
--i;
|
||||
dir[i] = '\0';
|
||||
}
|
||||
@@ -224,12 +224,12 @@
|
||||
@@ -207,12 +207,12 @@
|
||||
joinpath(wchar_t *buffer, wchar_t *stuff)
|
||||
{
|
||||
size_t n, k;
|
||||
@@ -200,7 +201,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
}
|
||||
if (n > MAXPATHLEN)
|
||||
Py_FatalError("buffer overflow in getpath.c's joinpath()");
|
||||
@@ -245,7 +245,7 @@
|
||||
@@ -228,7 +228,7 @@
|
||||
static void
|
||||
copy_absolute(wchar_t *path, wchar_t *p, size_t pathlen)
|
||||
{
|
||||
@@ -209,7 +210,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
wcscpy(path, p);
|
||||
else {
|
||||
if (!_Py_wgetcwd(path, pathlen)) {
|
||||
@@ -253,7 +253,7 @@
|
||||
@@ -236,7 +236,7 @@
|
||||
wcscpy(path, p);
|
||||
return;
|
||||
}
|
||||
@@ -218,7 +219,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
p += 2;
|
||||
joinpath(path, p);
|
||||
}
|
||||
@@ -265,7 +265,7 @@
|
||||
@@ -248,7 +248,7 @@
|
||||
{
|
||||
wchar_t buffer[MAXPATHLEN+1];
|
||||
|
||||
@@ -227,7 +228,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
return;
|
||||
copy_absolute(buffer, path, MAXPATHLEN+1);
|
||||
wcscpy(path, buffer);
|
||||
@@ -478,7 +478,7 @@
|
||||
@@ -461,7 +461,7 @@
|
||||
extern wchar_t *Py_GetProgramName(void);
|
||||
|
||||
static wchar_t delimiter[2] = {DELIM, '\0'};
|
||||
@@ -236,7 +237,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
char *_rtpypath = Py_GETENV("PYTHONPATH"); /* XXX use wide version on Windows */
|
||||
wchar_t *rtpypath = NULL;
|
||||
wchar_t *home = Py_GetPythonHome();
|
||||
@@ -507,11 +507,12 @@
|
||||
@@ -490,11 +490,12 @@
|
||||
#endif
|
||||
wchar_t *_pythonpath, *_prefix, *_exec_prefix;
|
||||
wchar_t *lib_python;
|
||||
@@ -250,7 +251,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
|
||||
if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
|
||||
Py_FatalError(
|
||||
@@ -529,7 +530,7 @@
|
||||
@@ -512,7 +513,7 @@
|
||||
* other way to find a directory to start the search from. If
|
||||
* $PATH isn't exported, you lose.
|
||||
*/
|
||||
@@ -259,7 +260,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
wcsncpy(progpath, prog, MAXPATHLEN);
|
||||
#ifdef __APPLE__
|
||||
/* On Mac OS X, if a script uses an interpreter of the form
|
||||
@@ -578,7 +579,7 @@
|
||||
@@ -561,7 +562,7 @@
|
||||
else
|
||||
progpath[0] = '\0';
|
||||
PyMem_RawFree(path_buffer);
|
||||
@@ -268,7 +269,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
absolutize(progpath);
|
||||
wcsncpy(argv0_path, progpath, MAXPATHLEN);
|
||||
argv0_path[MAXPATHLEN] = '\0';
|
||||
@@ -736,7 +737,7 @@
|
||||
@@ -719,7 +720,7 @@
|
||||
while (1) {
|
||||
wchar_t *delim = wcschr(defpath, DELIM);
|
||||
|
||||
@@ -277,7 +278,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
/* Paths are relative to prefix */
|
||||
bufsz += prefixsz;
|
||||
|
||||
@@ -777,7 +778,7 @@
|
||||
@@ -760,7 +761,7 @@
|
||||
while (1) {
|
||||
wchar_t *delim = wcschr(defpath, DELIM);
|
||||
|
||||
@@ -286,10 +287,10 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
wcscat(buf, prefix);
|
||||
wcscat(buf, separator);
|
||||
}
|
||||
diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmodule.c
|
||||
--- Python-3.5.0-orig/Modules/posixmodule.c 2015-09-21 13:41:14.291420300 +0300
|
||||
+++ Python-3.5.0/Modules/posixmodule.c 2015-09-21 13:42:03.062596000 +0300
|
||||
@@ -3318,6 +3318,7 @@
|
||||
diff -Naur Python-3.5.2-orig/Modules/posixmodule.c Python-3.5.2/Modules/posixmodule.c
|
||||
--- Python-3.5.2-orig/Modules/posixmodule.c 2016-07-12 14:20:48.017800700 +0300
|
||||
+++ Python-3.5.2/Modules/posixmodule.c 2016-07-12 14:21:58.223300700 +0300
|
||||
@@ -3320,6 +3320,7 @@
|
||||
PyMem_RawFree(wbuf2);
|
||||
return PyErr_SetFromWindowsErr(0);
|
||||
}
|
||||
@@ -297,7 +298,7 @@ diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmod
|
||||
resobj = PyUnicode_FromWideChar(wbuf2, len);
|
||||
if (wbuf2 != wbuf)
|
||||
PyMem_RawFree(wbuf2);
|
||||
@@ -3796,7 +3797,10 @@
|
||||
@@ -3798,7 +3799,10 @@
|
||||
result = GetFullPathNameW(path->wide, result, woutbufp, &wtemp);
|
||||
}
|
||||
if (result)
|
||||
@@ -308,7 +309,7 @@ diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmod
|
||||
else
|
||||
v = win32_error_object("GetFullPathNameW", path->object);
|
||||
if (woutbufp != woutbuf)
|
||||
@@ -3812,6 +3816,7 @@
|
||||
@@ -3814,6 +3818,7 @@
|
||||
win32_error_object("GetFullPathName", path->object);
|
||||
return NULL;
|
||||
}
|
||||
@@ -316,7 +317,7 @@ diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmod
|
||||
return PyBytes_FromString(outbuf);
|
||||
}
|
||||
}
|
||||
@@ -3873,6 +3878,7 @@
|
||||
@@ -3875,6 +3880,7 @@
|
||||
if(!CloseHandle(hFile))
|
||||
return win32_error_object("CloseHandle", path);
|
||||
|
||||
@@ -324,9 +325,9 @@ diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmod
|
||||
target_path[result_length] = 0;
|
||||
result = PyUnicode_FromWideChar(target_path, result_length);
|
||||
PyMem_Free(target_path);
|
||||
diff -Naur Python-3.5.0-orig/Python/pylifecycle.c Python-3.5.0/Python/pylifecycle.c
|
||||
--- Python-3.5.0-orig/Python/pylifecycle.c 2015-09-13 14:41:26.000000000 +0300
|
||||
+++ Python-3.5.0/Python/pylifecycle.c 2015-09-21 13:42:03.089687200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Python/pylifecycle.c Python-3.5.2/Python/pylifecycle.c
|
||||
--- Python-3.5.2-orig/Python/pylifecycle.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Python/pylifecycle.c 2016-07-12 14:21:58.247300700 +0300
|
||||
@@ -831,17 +831,123 @@
|
||||
PyInterpreterState_Delete(interp);
|
||||
}
|
||||
@@ -455,10 +456,10 @@ diff -Naur Python-3.5.0-orig/Python/pylifecycle.c Python-3.5.0/Python/pylifecycl
|
||||
}
|
||||
|
||||
wchar_t *
|
||||
diff -Naur Python-3.5.0-orig/Python/sysmodule.c Python-3.5.0/Python/sysmodule.c
|
||||
--- Python-3.5.0-orig/Python/sysmodule.c 2015-09-13 14:41:26.000000000 +0300
|
||||
+++ Python-3.5.0/Python/sysmodule.c 2015-09-21 13:42:03.098717600 +0300
|
||||
@@ -2048,7 +2048,7 @@
|
||||
diff -Naur Python-3.5.2-orig/Python/sysmodule.c Python-3.5.2/Python/sysmodule.c
|
||||
--- Python-3.5.2-orig/Python/sysmodule.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Python/sysmodule.c 2016-07-12 14:21:58.262800700 +0300
|
||||
@@ -2071,7 +2071,7 @@
|
||||
argv0 = fullpath;
|
||||
}
|
||||
#endif
|
||||
@@ -467,9 +468,9 @@ diff -Naur Python-3.5.0-orig/Python/sysmodule.c Python-3.5.0/Python/sysmodule.c
|
||||
}
|
||||
if (p != NULL) {
|
||||
n = p + 1 - argv0;
|
||||
diff -Naur Python-3.5.0-orig/Python/traceback.c Python-3.5.0/Python/traceback.c
|
||||
--- Python-3.5.0-orig/Python/traceback.c 2015-09-13 14:41:26.000000000 +0300
|
||||
+++ Python-3.5.0/Python/traceback.c 2015-09-21 13:42:03.115649600 +0300
|
||||
diff -Naur Python-3.5.2-orig/Python/traceback.c Python-3.5.2/Python/traceback.c
|
||||
--- Python-3.5.2-orig/Python/traceback.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Python/traceback.c 2016-07-12 14:21:58.278300700 +0300
|
||||
@@ -199,7 +199,7 @@
|
||||
filepath = PyBytes_AS_STRING(filebytes);
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:42:01.382941600 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:42:04.711772800 +0300
|
||||
@@ -5243,7 +5243,7 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:21:55.830300700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:22:00.308800700 +0300
|
||||
@@ -5373,7 +5373,7 @@
|
||||
case $host in
|
||||
*-*-mingw*)
|
||||
dnl default sys.path calculations for windows platforms
|
||||
@@ -10,9 +10,9 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
;;
|
||||
esac
|
||||
|
||||
diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
--- Python-3.5.0-orig/Modules/getpath.c 2015-09-21 13:42:04.532293600 +0300
|
||||
+++ Python-3.5.0/Modules/getpath.c 2015-09-21 13:42:04.737735200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/getpath.c Python-3.5.2/Modules/getpath.c
|
||||
--- Python-3.5.2-orig/Modules/getpath.c 2016-07-12 14:21:59.929800700 +0300
|
||||
+++ Python-3.5.2/Modules/getpath.c 2016-07-12 14:22:00.325800700 +0300
|
||||
@@ -10,6 +10,10 @@
|
||||
#include <mach-o/dyld.h>
|
||||
#endif
|
||||
@@ -24,7 +24,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
/* Search in some common locations for the associated Python libraries.
|
||||
*
|
||||
* Two directories must be found, the platform independent directory
|
||||
@@ -126,9 +130,17 @@
|
||||
@@ -109,9 +113,17 @@
|
||||
#define LANDMARK L"os.py"
|
||||
#endif
|
||||
|
||||
@@ -42,7 +42,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
static wchar_t *module_search_path = NULL;
|
||||
|
||||
/* Get file status. Encode the path to the locale encoding. */
|
||||
@@ -154,7 +166,7 @@
|
||||
@@ -137,7 +149,7 @@
|
||||
size_t i = wcslen(dir);
|
||||
while (i > 0 && dir[i] != Py_GetSepW(dir))
|
||||
--i;
|
||||
@@ -51,7 +51,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -472,6 +484,26 @@
|
||||
@@ -455,6 +467,26 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
static void
|
||||
calculate_path(void)
|
||||
{
|
||||
@@ -551,6 +583,10 @@
|
||||
@@ -534,6 +566,10 @@
|
||||
}
|
||||
}
|
||||
#endif /* __APPLE__ */
|
||||
@@ -89,7 +89,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
else if (path) {
|
||||
while (1) {
|
||||
wchar_t *delim = wcschr(path, DELIM);
|
||||
@@ -889,6 +925,45 @@
|
||||
@@ -872,6 +908,45 @@
|
||||
}
|
||||
|
||||
|
||||
@@ -135,10 +135,10 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmodule.c
|
||||
--- Python-3.5.0-orig/Modules/posixmodule.c 2015-09-21 13:42:04.541324000 +0300
|
||||
+++ Python-3.5.0/Modules/posixmodule.c 2015-09-21 13:42:04.747894400 +0300
|
||||
@@ -3548,7 +3548,7 @@
|
||||
diff -Naur Python-3.5.2-orig/Modules/posixmodule.c Python-3.5.2/Modules/posixmodule.c
|
||||
--- Python-3.5.2-orig/Modules/posixmodule.c 2016-07-12 14:21:59.946800700 +0300
|
||||
+++ Python-3.5.2/Modules/posixmodule.c 2016-07-12 14:22:00.338300700 +0300
|
||||
@@ -3550,7 +3550,7 @@
|
||||
Py_END_ALLOW_THREADS
|
||||
/* FindNextFile sets error to ERROR_NO_MORE_FILES if
|
||||
it got to the end of the directory. */
|
||||
@@ -147,7 +147,7 @@ diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmod
|
||||
Py_DECREF(list);
|
||||
list = path_error(path);
|
||||
goto exit;
|
||||
@@ -3603,7 +3603,7 @@
|
||||
@@ -3605,7 +3605,7 @@
|
||||
Py_END_ALLOW_THREADS
|
||||
/* FindNextFile sets error to ERROR_NO_MORE_FILES if
|
||||
it got to the end of the directory. */
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
--- Python-3.5.0-orig/Modules/getpath.c 2015-09-21 13:42:06.130674400 +0300
|
||||
+++ Python-3.5.0/Modules/getpath.c 2015-09-21 13:42:06.274032000 +0300
|
||||
@@ -865,6 +865,32 @@
|
||||
diff -Naur Python-3.5.2-orig/Modules/getpath.c Python-3.5.2/Modules/getpath.c
|
||||
--- Python-3.5.2-orig/Modules/getpath.c 2016-07-12 14:22:01.929300700 +0300
|
||||
+++ Python-3.5.2/Modules/getpath.c 2016-07-12 14:22:02.242800700 +0300
|
||||
@@ -848,6 +848,32 @@
|
||||
else
|
||||
wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Modules/Setup.config.in Python-3.5.0/Modules/Setup.config.in
|
||||
--- Python-3.5.0-orig/Modules/Setup.config.in 2015-09-21 13:41:18.307018700 +0300
|
||||
+++ Python-3.5.0/Modules/Setup.config.in 2015-09-21 13:42:07.709865600 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/Setup.config.in Python-3.5.2/Modules/Setup.config.in
|
||||
--- Python-3.5.2-orig/Modules/Setup.config.in 2016-07-12 14:20:53.904300700 +0300
|
||||
+++ Python-3.5.2/Modules/Setup.config.in 2016-07-12 14:22:04.057800700 +0300
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
# build-in modules for windows platform:
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:42:02.883116800 +0300
|
||||
+++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:09.127638400 +0300
|
||||
@@ -1091,6 +1091,7 @@
|
||||
diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in
|
||||
--- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:21:57.813300700 +0300
|
||||
+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:22:05.917300700 +0300
|
||||
@@ -1128,6 +1128,7 @@
|
||||
if test -f $(LDLIBRARY) && test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \
|
||||
if test -n "$(DLLLIBRARY)" ; then \
|
||||
$(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:42:06.113742400 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:42:10.548797600 +0300
|
||||
@@ -612,6 +612,65 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:22:01.911300700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:22:07.823300700 +0300
|
||||
@@ -613,6 +613,65 @@
|
||||
AC_MSG_RESULT([$DELIM])
|
||||
AC_SUBST(DELIM)
|
||||
|
||||
@@ -67,10 +67,10 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
AC_MSG_CHECKING([for init system calls])
|
||||
AC_SUBST(INITSYS)
|
||||
case $host in
|
||||
diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py
|
||||
--- Python-3.5.0-orig/Lib/sysconfig.py 2015-09-21 13:41:47.820067100 +0300
|
||||
+++ Python-3.5.0/Lib/sysconfig.py 2015-09-21 13:42:10.564600800 +0300
|
||||
@@ -323,6 +323,14 @@
|
||||
diff -Naur Python-3.5.2-orig/Lib/sysconfig.py Python-3.5.2/Lib/sysconfig.py
|
||||
--- Python-3.5.2-orig/Lib/sysconfig.py 2016-07-12 14:21:37.313800700 +0300
|
||||
+++ Python-3.5.2/Lib/sysconfig.py 2016-07-12 14:22:07.846300700 +0300
|
||||
@@ -328,6 +328,14 @@
|
||||
if isinstance(v, str):
|
||||
done[k] = v.strip()
|
||||
|
||||
@@ -85,10 +85,10 @@ diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py
|
||||
# save the results in the global dictionary
|
||||
vars.update(done)
|
||||
return vars
|
||||
diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:42:10.415599200 +0300
|
||||
+++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:10.572502400 +0300
|
||||
@@ -115,6 +115,13 @@
|
||||
diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in
|
||||
--- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:22:07.471800700 +0300
|
||||
+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:22:07.854300700 +0300
|
||||
@@ -120,6 +120,13 @@
|
||||
# Install prefix for data files
|
||||
datarootdir= @datarootdir@
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/command/build_ext.py Python-3.5.0/Lib/distutils/command/build_ext.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/command/build_ext.py 2015-09-21 13:41:42.771572000 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/command/build_ext.py 2015-09-21 13:42:12.037684800 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/command/build_ext.py Python-3.5.2/Lib/distutils/command/build_ext.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/command/build_ext.py 2016-07-12 14:21:30.074800700 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/command/build_ext.py 2016-07-12 14:22:09.824300700 +0300
|
||||
@@ -219,9 +219,10 @@
|
||||
if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
|
||||
if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
|
||||
@@ -13,9 +13,9 @@ diff -Naur Python-3.5.0-orig/Lib/distutils/command/build_ext.py Python-3.5.0/Lib
|
||||
else:
|
||||
# building python standard extensions
|
||||
self.library_dirs.append('.')
|
||||
diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py
|
||||
--- Python-3.5.0-orig/Lib/sysconfig.py 2015-09-21 13:42:11.910130400 +0300
|
||||
+++ Python-3.5.0/Lib/sysconfig.py 2015-09-21 13:42:12.044457600 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/sysconfig.py Python-3.5.2/Lib/sysconfig.py
|
||||
--- Python-3.5.2-orig/Lib/sysconfig.py 2016-07-12 14:22:09.509300700 +0300
|
||||
+++ Python-3.5.2/Lib/sysconfig.py 2016-07-12 14:22:09.837300700 +0300
|
||||
@@ -42,22 +42,22 @@
|
||||
'data': '{base}',
|
||||
},
|
||||
@@ -52,7 +52,7 @@ diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py
|
||||
'data': '{userbase}',
|
||||
},
|
||||
'posix_user': {
|
||||
@@ -436,7 +436,7 @@
|
||||
@@ -441,7 +441,7 @@
|
||||
vars['INCLUDEPY'] = get_path('include')
|
||||
vars['EXT_SUFFIX'] = '.pyd'
|
||||
vars['EXE'] = '.exe'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py 2015-09-21 13:41:51.606688400 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/cygwinccompiler.py 2015-09-21 13:42:14.136124000 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/cygwinccompiler.py Python-3.5.2/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/cygwinccompiler.py 2016-07-12 14:21:42.917300700 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/cygwinccompiler.py 2016-07-12 14:22:11.780300700 +0300
|
||||
@@ -58,6 +58,7 @@
|
||||
from distutils import log
|
||||
from distutils.version import LooseVersion
|
||||
@@ -36,9 +36,9 @@ diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/d
|
||||
return tuple([_find_exe_version(cmd) for cmd in commands])
|
||||
|
||||
def is_cygwingcc():
|
||||
diff -Naur Python-3.5.0-orig/Modules/Setup.config.in Python-3.5.0/Modules/Setup.config.in
|
||||
--- Python-3.5.0-orig/Modules/Setup.config.in 2015-09-21 13:42:08.977508000 +0300
|
||||
+++ Python-3.5.0/Modules/Setup.config.in 2015-09-21 13:42:14.150798400 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/Setup.config.in Python-3.5.2/Modules/Setup.config.in
|
||||
--- Python-3.5.2-orig/Modules/Setup.config.in 2016-07-12 14:22:05.619800700 +0300
|
||||
+++ Python-3.5.2/Modules/Setup.config.in 2016-07-12 14:22:11.816800700 +0300
|
||||
@@ -18,6 +18,7 @@
|
||||
# build-in modules for windows platform:
|
||||
@USE_WIN32_MODULE@winreg ../PC/winreg.c
|
||||
@@ -47,10 +47,10 @@ diff -Naur Python-3.5.0-orig/Modules/Setup.config.in Python-3.5.0/Modules/Setup.
|
||||
|
||||
# The rest of the modules previously listed in this file are built
|
||||
# by the setup.py script in Python 2.1 and later.
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:59.908728800 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:42:14.157571200 +0300
|
||||
@@ -918,7 +918,9 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:21:53.888800700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:22:11.822800700 +0300
|
||||
@@ -948,7 +948,9 @@
|
||||
exts.append( Extension('msvcrt', [os.path.join(pc_srcdir, p)
|
||||
for p in ['msvcrtmodule.c']]) )
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Include/pyport.h Python-3.5.0/Include/pyport.h
|
||||
--- Python-3.5.0-orig/Include/pyport.h 2015-09-21 13:41:27.338115500 +0300
|
||||
+++ Python-3.5.0/Include/pyport.h 2015-09-21 13:42:15.719830400 +0300
|
||||
diff -Naur Python-3.5.2-orig/Include/pyport.h Python-3.5.2/Include/pyport.h
|
||||
--- Python-3.5.2-orig/Include/pyport.h 2016-07-12 14:21:07.205300700 +0300
|
||||
+++ Python-3.5.2/Include/pyport.h 2016-07-12 14:22:13.662800700 +0300
|
||||
@@ -257,6 +257,8 @@
|
||||
# define PY_FORMAT_SIZE_T "l"
|
||||
# elif defined(MS_WINDOWS)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:42:15.605821600 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:42:17.110512000 +0300
|
||||
@@ -474,10 +474,10 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:22:13.404800700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:22:15.531300700 +0300
|
||||
@@ -497,10 +497,10 @@
|
||||
if not cross_compiling:
|
||||
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
||||
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/compileall.py Python-3.5.0/Lib/compileall.py
|
||||
--- Python-3.5.0-orig/Lib/compileall.py 2015-09-13 14:41:20.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/compileall.py 2015-09-21 13:42:18.631005600 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/compileall.py Python-3.5.2/Lib/compileall.py
|
||||
--- Python-3.5.2-orig/Lib/compileall.py 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/compileall.py 2016-07-12 14:22:17.360300700 +0300
|
||||
@@ -38,6 +38,8 @@
|
||||
if name == '__pycache__':
|
||||
continue
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/command/install.py Python-3.5.0/Lib/distutils/command/install.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/command/install.py 2015-09-13 14:41:20.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/command/install.py 2015-09-21 13:42:20.106347200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/command/install.py Python-3.5.2/Lib/distutils/command/install.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/command/install.py 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/command/install.py 2016-07-12 14:22:19.111300700 +0300
|
||||
@@ -340,7 +340,8 @@
|
||||
|
||||
# Convert directories from Unix /-separated syntax to the local
|
||||
@@ -11,9 +11,9 @@ diff -Naur Python-3.5.0-orig/Lib/distutils/command/install.py Python-3.5.0/Lib/d
|
||||
'scripts', 'data', 'headers',
|
||||
'userbase', 'usersite')
|
||||
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/util.py Python-3.5.0/Lib/distutils/util.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/util.py 2015-09-21 13:41:42.786570500 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/util.py 2015-09-21 13:42:20.121021600 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/util.py Python-3.5.2/Lib/distutils/util.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/util.py 2016-07-12 14:21:30.080800700 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/util.py 2016-07-12 14:22:19.117300700 +0300
|
||||
@@ -133,6 +133,13 @@
|
||||
paths.remove('.')
|
||||
if not paths:
|
||||
@@ -62,10 +62,10 @@ diff -Naur Python-3.5.0-orig/Lib/distutils/util.py Python-3.5.0/Lib/distutils/ut
|
||||
|
||||
else:
|
||||
raise DistutilsPlatformError("nothing known about platform '%s'" % os.name)
|
||||
diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:42:11.916903200 +0300
|
||||
+++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:20.127794400 +0300
|
||||
@@ -1420,6 +1420,12 @@
|
||||
diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in
|
||||
--- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:22:09.517800700 +0300
|
||||
+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:22:19.131800700 +0300
|
||||
@@ -1461,6 +1461,12 @@
|
||||
else true; \
|
||||
fi
|
||||
|
||||
@@ -78,7 +78,7 @@ diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
# Install the dynamically loadable modules
|
||||
# This goes into $(exec_prefix)
|
||||
sharedinstall: sharedmods
|
||||
@@ -1427,9 +1433,9 @@
|
||||
@@ -1468,9 +1474,9 @@
|
||||
--prefix=$(prefix) \
|
||||
--install-scripts=$(BINDIR) \
|
||||
--install-platlib=$(DESTSHARED) \
|
||||
@@ -91,7 +91,7 @@ diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
|
||||
# Here are a couple of targets for MacOSX again, to install a full
|
||||
# framework-based Python. frameworkinstall installs everything, the
|
||||
@@ -1510,7 +1516,7 @@
|
||||
@@ -1551,7 +1557,7 @@
|
||||
$(PYTHON_FOR_BUILD) $(srcdir)/Tools/scripts/setup.py install \
|
||||
--prefix=$(prefix) \
|
||||
--install-scripts=$(BINDIR) \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:42:18.491034400 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:42:21.553468800 +0300
|
||||
@@ -553,7 +553,7 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:22:17.097800700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:22:20.941800700 +0300
|
||||
@@ -576,7 +576,7 @@
|
||||
if host_platform == 'hp-ux11':
|
||||
lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
|
||||
|
||||
@@ -10,7 +10,7 @@ diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
# This should work on any unixy platform ;-)
|
||||
# If the user has bothered specifying additional -I and -L flags
|
||||
# in OPT and LDFLAGS we might as well use them here.
|
||||
@@ -563,6 +563,8 @@
|
||||
@@ -586,6 +586,8 @@
|
||||
# directories with whitespace in the name to store libraries.
|
||||
cflags, ldflags = sysconfig.get_config_vars(
|
||||
'CFLAGS', 'LDFLAGS')
|
||||
@@ -19,7 +19,7 @@ diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
for item in cflags.split():
|
||||
if item.startswith('-I'):
|
||||
inc_dirs.append(item[2:])
|
||||
@@ -1783,14 +1785,19 @@
|
||||
@@ -1809,14 +1811,19 @@
|
||||
# The versions with dots are used on Unix, and the versions without
|
||||
# dots on Windows, for detection by cygwin.
|
||||
tcllib = tklib = tcl_includes = tk_includes = None
|
||||
@@ -47,7 +47,7 @@ diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
break
|
||||
|
||||
# Now check for the header files
|
||||
@@ -1858,13 +1865,21 @@
|
||||
@@ -1884,13 +1891,21 @@
|
||||
# Add the Tcl/Tk libraries
|
||||
libs.append('tk'+ version)
|
||||
libs.append('tcl'+ version)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:42:11.881910400 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:42:23.013007200 +0300
|
||||
@@ -4969,7 +4969,9 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:22:09.502800700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:22:22.695800700 +0300
|
||||
@@ -5099,7 +5099,9 @@
|
||||
|
||||
# first curses header check
|
||||
ac_save_cppflags="$CPPFLAGS"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:42:24.324672800 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:42:24.444325600 +0300
|
||||
@@ -5008,15 +5008,51 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:22:24.130800700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:22:24.460800700 +0300
|
||||
@@ -5138,15 +5138,51 @@
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(whether WINDOW has _flags)
|
||||
@@ -55,9 +55,9 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
|
||||
if test "$ac_cv_window_has_flags" = yes
|
||||
then
|
||||
diff -Naur Python-3.5.0-orig/Include/py_curses.h Python-3.5.0/Include/py_curses.h
|
||||
--- Python-3.5.0-orig/Include/py_curses.h 2015-09-13 14:41:20.000000000 +0300
|
||||
+++ Python-3.5.0/Include/py_curses.h 2015-09-21 13:42:24.460128800 +0300
|
||||
diff -Naur Python-3.5.2-orig/Include/py_curses.h Python-3.5.2/Include/py_curses.h
|
||||
--- Python-3.5.2-orig/Include/py_curses.h 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Include/py_curses.h 2016-07-12 14:22:24.476800700 +0300
|
||||
@@ -14,7 +14,9 @@
|
||||
/* the following define is necessary for OS X 10.6; without it, the
|
||||
Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python
|
||||
@@ -81,10 +81,10 @@ diff -Naur Python-3.5.0-orig/Include/py_curses.h Python-3.5.0/Include/py_curses.
|
||||
#ifndef MVWDELCH_IS_EXPRESSION
|
||||
#define MVWDELCH_IS_EXPRESSION 1
|
||||
#endif
|
||||
diff -Naur Python-3.5.0-orig/pyconfig.h.in Python-3.5.0/pyconfig.h.in
|
||||
--- Python-3.5.0-orig/pyconfig.h.in 2015-09-21 13:41:38.930956100 +0300
|
||||
+++ Python-3.5.0/pyconfig.h.in 2015-09-21 13:42:24.475932000 +0300
|
||||
@@ -1202,6 +1202,12 @@
|
||||
diff -Naur Python-3.5.2-orig/pyconfig.h.in Python-3.5.2/pyconfig.h.in
|
||||
--- Python-3.5.2-orig/pyconfig.h.in 2016-07-12 14:21:24.383800700 +0300
|
||||
+++ Python-3.5.2/pyconfig.h.in 2016-07-12 14:22:24.483300700 +0300
|
||||
@@ -1207,6 +1207,12 @@
|
||||
/* Define to 1 if you want to use native NT threads */
|
||||
#undef NT_THREADS
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Include/py_curses.h Python-3.5.0/Include/py_curses.h
|
||||
--- Python-3.5.0-orig/Include/py_curses.h 2015-09-21 13:42:25.872257600 +0300
|
||||
+++ Python-3.5.0/Include/py_curses.h 2015-09-21 13:42:26.009971200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Include/py_curses.h Python-3.5.2/Include/py_curses.h
|
||||
--- Python-3.5.2-orig/Include/py_curses.h 2016-07-12 14:22:25.991300700 +0300
|
||||
+++ Python-3.5.2/Include/py_curses.h 2016-07-12 14:22:26.239300700 +0300
|
||||
@@ -56,6 +56,10 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Modules/_cursesmodule.c Python-3.5.0/Modules/_cursesmodule.c
|
||||
--- Python-3.5.0-orig/Modules/_cursesmodule.c 2015-09-13 14:41:24.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/_cursesmodule.c 2015-09-21 13:42:27.468380800 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/_cursesmodule.c Python-3.5.2/Modules/_cursesmodule.c
|
||||
--- Python-3.5.2-orig/Modules/_cursesmodule.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/_cursesmodule.c 2016-07-12 14:22:27.944300700 +0300
|
||||
@@ -125,6 +125,10 @@
|
||||
#include <langinfo.h>
|
||||
#endif
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Modules/parsermodule.c Python-3.5.0/Modules/parsermodule.c
|
||||
--- Python-3.5.0-orig/Modules/parsermodule.c 2015-09-13 14:41:25.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/parsermodule.c 2015-09-21 13:42:28.943722400 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/parsermodule.c Python-3.5.2/Modules/parsermodule.c
|
||||
--- Python-3.5.2-orig/Modules/parsermodule.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/parsermodule.c 2016-07-12 14:22:29.674300700 +0300
|
||||
@@ -42,7 +42,7 @@
|
||||
#undef Yield
|
||||
#include "ast.h"
|
||||
@@ -10,9 +10,9 @@ diff -Naur Python-3.5.0-orig/Modules/parsermodule.c Python-3.5.0/Modules/parserm
|
||||
|
||||
#ifdef lint
|
||||
#include <note.h>
|
||||
diff -Naur Python-3.5.0-orig/Parser/metagrammar.c Python-3.5.0/Parser/metagrammar.c
|
||||
--- Python-3.5.0-orig/Parser/metagrammar.c 2015-09-13 14:41:26.000000000 +0300
|
||||
+++ Python-3.5.0/Parser/metagrammar.c 2015-09-21 13:42:28.955010400 +0300
|
||||
diff -Naur Python-3.5.2-orig/Parser/metagrammar.c Python-3.5.2/Parser/metagrammar.c
|
||||
--- Python-3.5.2-orig/Parser/metagrammar.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Parser/metagrammar.c 2016-07-12 14:22:29.718800700 +0300
|
||||
@@ -139,7 +139,7 @@
|
||||
{7, 0},
|
||||
{8, 0},
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:42:21.427043200 +0300
|
||||
+++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:30.499208800 +0300
|
||||
@@ -701,15 +701,15 @@
|
||||
diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in
|
||||
--- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:22:20.694800700 +0300
|
||||
+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:22:31.389800700 +0300
|
||||
@@ -723,18 +723,18 @@
|
||||
|
||||
Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile
|
||||
|
||||
@@ -10,30 +10,33 @@ diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
||||
|
||||
-Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib
|
||||
- ./Programs/_freeze_importlib \
|
||||
+Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib$(EXE)
|
||||
+ ./Programs/_freeze_importlib$(EXE) \
|
||||
$(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h
|
||||
if test "$(cross_compiling)" != "yes"; then \
|
||||
- ./Programs/_freeze_importlib \
|
||||
+ ./Programs/_freeze_importlib$(EXE) \
|
||||
$(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h; \
|
||||
fi
|
||||
|
||||
-Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib
|
||||
- ./Programs/_freeze_importlib \
|
||||
+Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib$(EXE)
|
||||
+ ./Programs/_freeze_importlib$(EXE) \
|
||||
$(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
|
||||
if test "$(cross_compiling)" != "yes"; then \
|
||||
- ./Programs/_freeze_importlib \
|
||||
+ ./Programs/_freeze_importlib$(EXE) \
|
||||
$(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h; \
|
||||
fi
|
||||
|
||||
|
||||
@@ -1596,7 +1596,7 @@
|
||||
@@ -1637,7 +1637,7 @@
|
||||
find build -name '*.py[co]' -exec rm -f {} ';' || true
|
||||
-rm -f pybuilddir.txt
|
||||
-rm -f Lib/lib2to3/*Grammar*.pickle
|
||||
- -rm -f Programs/_testembed Programs/_freeze_importlib
|
||||
+ -rm -f Programs/_testembed Programs/_freeze_importlib$(EXE)
|
||||
-rm -rf build
|
||||
|
||||
profile-removal:
|
||||
find . -name '*.gc??' -exec rm -f {} ';'
|
||||
diff -Naur Python-3.5.0-orig/Programs/_freeze_importlib.c Python-3.5.0/Programs/_freeze_importlib.c
|
||||
--- Python-3.5.0-orig/Programs/_freeze_importlib.c 2015-09-21 13:42:21.427043200 +0300
|
||||
+++ Python-3.5.0/Programs/_freeze_importlib.c 2015-09-21 13:42:30.499208800 +0300
|
||||
diff -Naur Python-3.5.2-orig/Programs/_freeze_importlib.c Python-3.5.2/Programs/_freeze_importlib.c
|
||||
--- Python-3.5.2-orig/Programs/_freeze_importlib.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Programs/_freeze_importlib.c 2016-07-12 14:22:31.403800700 +0300
|
||||
@@ -20,7 +20,7 @@
|
||||
{0, 0, 0} /* sentinel */
|
||||
};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:42:22.874164800 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:42:32.027604000 +0300
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:22:22.434800700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:22:33.134800700 +0300
|
||||
@@ -40,6 +40,17 @@
|
||||
return sys.platform
|
||||
host_platform = get_platform()
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:42:33.399096000 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:42:33.531165600 +0300
|
||||
@@ -404,7 +404,7 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:22:34.521800700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:22:34.746300700 +0300
|
||||
@@ -420,7 +420,7 @@
|
||||
# Debian/Ubuntu multiarch support.
|
||||
# https://wiki.ubuntu.com/MultiarchSpec
|
||||
cc = sysconfig.get_config_var('CC')
|
||||
@@ -10,7 +10,7 @@ diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
if not os.path.exists(self.build_temp):
|
||||
os.makedirs(self.build_temp)
|
||||
ret = os.system(
|
||||
@@ -429,7 +429,7 @@
|
||||
@@ -445,7 +445,7 @@
|
||||
opt = ''
|
||||
if cross_compiling:
|
||||
opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE')
|
||||
@@ -19,7 +19,7 @@ diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
if not os.path.exists(self.build_temp):
|
||||
os.makedirs(self.build_temp)
|
||||
ret = os.system(
|
||||
@@ -448,7 +448,7 @@
|
||||
@@ -464,7 +464,7 @@
|
||||
|
||||
def add_gcc_paths(self):
|
||||
gcc = sysconfig.get_config_var('CC')
|
||||
@@ -28,7 +28,7 @@ diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
if not os.path.exists(self.build_temp):
|
||||
os.makedirs(self.build_temp)
|
||||
ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
|
||||
@@ -714,7 +714,7 @@
|
||||
@@ -744,7 +744,7 @@
|
||||
readline_termcap_library = ""
|
||||
curses_library = ""
|
||||
# Cannot use os.popen here in py3k.
|
||||
@@ -37,7 +37,7 @@ diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
if not os.path.exists(self.build_temp):
|
||||
os.makedirs(self.build_temp)
|
||||
# Determine if readline is already linked against curses or tinfo.
|
||||
@@ -859,7 +859,7 @@
|
||||
@@ -889,7 +889,7 @@
|
||||
opensslv_h = find_file('openssl/opensslv.h', [],
|
||||
inc_dirs + search_for_ssl_incs_in)
|
||||
if opensslv_h:
|
||||
@@ -46,7 +46,7 @@ diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
if host_platform == 'darwin' and is_macosx_sdk_path(name):
|
||||
name = os.path.join(macosx_sdk_root(), name[1:])
|
||||
try:
|
||||
@@ -1742,16 +1742,16 @@
|
||||
@@ -1768,16 +1768,16 @@
|
||||
cflags = sysconfig.get_config_vars('CFLAGS')[0]
|
||||
archs = re.findall('-arch\s+(\w+)', cflags)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
--- Python-3.5.0-orig/Modules/getpath.c 2015-09-21 13:42:07.576667200 +0300
|
||||
+++ Python-3.5.0/Modules/getpath.c 2015-09-21 13:42:35.020052800 +0300
|
||||
@@ -788,7 +788,10 @@
|
||||
diff -Naur Python-3.5.2-orig/Modules/getpath.c Python-3.5.2/Modules/getpath.c
|
||||
--- Python-3.5.2-orig/Modules/getpath.c 2016-07-12 14:22:03.781800700 +0300
|
||||
+++ Python-3.5.2/Modules/getpath.c 2016-07-12 14:22:36.410800700 +0300
|
||||
@@ -771,7 +771,10 @@
|
||||
|
||||
bufsz += wcslen(zip_path) + 1;
|
||||
bufsz += wcslen(exec_prefix) + 1;
|
||||
@@ -13,7 +13,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
buf = PyMem_New(wchar_t, bufsz);
|
||||
if (buf == NULL) {
|
||||
Py_FatalError(
|
||||
@@ -864,6 +867,13 @@
|
||||
@@ -847,6 +850,13 @@
|
||||
}
|
||||
else
|
||||
wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/command/install.py Python-3.5.0/Lib/distutils/command/install.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/command/install.py 2015-09-21 13:42:21.403338400 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/command/install.py 2015-09-21 13:42:36.497652000 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/command/install.py Python-3.5.2/Lib/distutils/command/install.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/command/install.py 2016-07-12 14:22:20.653300700 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/command/install.py 2016-07-12 14:22:38.128800700 +0300
|
||||
@@ -20,10 +20,10 @@
|
||||
HAS_USER_SITE = True
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
diff -Naur Python-3.5.0-orig/Include/osdefs.h Python-3.5.0/Include/osdefs.h
|
||||
--- Python-3.5.0-orig/Include/osdefs.h 2015-09-21 13:42:01.397616000 +0300
|
||||
+++ Python-3.5.0/Include/osdefs.h 2015-09-21 13:42:37.914296000 +0300
|
||||
diff -Naur Python-3.5.2-orig/Include/osdefs.h Python-3.5.2/Include/osdefs.h
|
||||
--- Python-3.5.2-orig/Include/osdefs.h 2016-07-12 14:21:55.858800700 +0300
|
||||
+++ Python-3.5.2/Include/osdefs.h 2016-07-12 14:22:39.819300700 +0300
|
||||
@@ -10,7 +10,6 @@
|
||||
#ifdef MS_WINDOWS
|
||||
#define SEP L'\\'
|
||||
#define ALTSEP L'/'
|
||||
-#define MAXPATHLEN 256
|
||||
#define DELIM L';'
|
||||
#define DELIMSTR ";"
|
||||
#define DELIMSTR L";"
|
||||
#endif
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
--- Python-3.5.0-orig/configure.ac 2015-09-21 13:42:25.866613600 +0300
|
||||
+++ Python-3.5.0/configure.ac 2015-09-21 13:42:39.390766400 +0300
|
||||
@@ -2687,10 +2687,19 @@
|
||||
diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:22:25.974800700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:22:41.505800700 +0300
|
||||
@@ -2812,10 +2812,19 @@
|
||||
fi
|
||||
|
||||
# check if we need libintl for locale functions
|
||||
@@ -21,9 +21,9 @@ diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac
|
||||
|
||||
# checks for system dependent C++ extensions support
|
||||
case "$ac_sys_system" in
|
||||
diff -Naur Python-3.5.0-orig/Modules/_localemodule.c Python-3.5.0/Modules/_localemodule.c
|
||||
--- Python-3.5.0-orig/Modules/_localemodule.c 2015-09-13 14:41:24.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/_localemodule.c 2015-09-21 13:42:39.406569600 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/_localemodule.c Python-3.5.2/Modules/_localemodule.c
|
||||
--- Python-3.5.2-orig/Modules/_localemodule.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/_localemodule.c 2016-07-12 14:22:41.521300700 +0300
|
||||
@@ -11,6 +11,13 @@
|
||||
|
||||
#define PY_SSIZE_T_CLEAN
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/ctypes/__init__.py Python-3.5.0/Lib/ctypes/__init__.py
|
||||
--- Python-3.5.0-orig/Lib/ctypes/__init__.py 2015-09-13 14:41:20.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/ctypes/__init__.py 2015-09-21 13:42:40.967700000 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/ctypes/__init__.py Python-3.5.2/Lib/ctypes/__init__.py
|
||||
--- Python-3.5.2-orig/Lib/ctypes/__init__.py 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/ctypes/__init__.py 2016-07-12 14:22:43.305800700 +0300
|
||||
@@ -427,7 +427,9 @@
|
||||
cdll = LibraryLoader(CDLL)
|
||||
pydll = LibraryLoader(PyDLL)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Modules/_gdbmmodule.c Python-3.5.0/Modules/_gdbmmodule.c
|
||||
--- Python-3.5.0-orig/Modules/_gdbmmodule.c 2015-09-13 14:41:24.000000000 +0300
|
||||
+++ Python-3.5.0/Modules/_gdbmmodule.c 2015-09-21 13:42:42.500610400 +0300
|
||||
diff -Naur Python-3.5.2-orig/Modules/_gdbmmodule.c Python-3.5.2/Modules/_gdbmmodule.c
|
||||
--- Python-3.5.2-orig/Modules/_gdbmmodule.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Modules/_gdbmmodule.c 2016-07-12 14:22:44.958300700 +0300
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <fcntl.h>
|
||||
#include "gdbm.h"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Include/bytesobject.h Python-3.5.0/Include/bytesobject.h
|
||||
--- Python-3.5.0-orig/Include/bytesobject.h 2015-09-13 14:41:20.000000000 +0300
|
||||
+++ Python-3.5.0/Include/bytesobject.h 2015-09-21 13:42:43.916125600 +0300
|
||||
diff -Naur Python-3.5.2-orig/Include/bytesobject.h Python-3.5.2/Include/bytesobject.h
|
||||
--- Python-3.5.2-orig/Include/bytesobject.h 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Include/bytesobject.h 2016-07-12 14:22:46.638300700 +0300
|
||||
@@ -52,9 +52,9 @@
|
||||
PyAPI_FUNC(PyObject *) PyBytes_FromString(const char *);
|
||||
PyAPI_FUNC(PyObject *) PyBytes_FromObject(PyObject *);
|
||||
@@ -13,9 +13,9 @@ diff -Naur Python-3.5.0-orig/Include/bytesobject.h Python-3.5.0/Include/bytesobj
|
||||
PyAPI_FUNC(Py_ssize_t) PyBytes_Size(PyObject *);
|
||||
PyAPI_FUNC(char *) PyBytes_AsString(PyObject *);
|
||||
PyAPI_FUNC(PyObject *) PyBytes_Repr(PyObject *, int);
|
||||
diff -Naur Python-3.5.0-orig/Include/pgenheaders.h Python-3.5.0/Include/pgenheaders.h
|
||||
--- Python-3.5.0-orig/Include/pgenheaders.h 2015-09-13 14:41:20.000000000 +0300
|
||||
+++ Python-3.5.0/Include/pgenheaders.h 2015-09-21 13:42:43.930800000 +0300
|
||||
diff -Naur Python-3.5.2-orig/Include/pgenheaders.h Python-3.5.2/Include/pgenheaders.h
|
||||
--- Python-3.5.2-orig/Include/pgenheaders.h 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Include/pgenheaders.h 2016-07-12 14:22:46.660300700 +0300
|
||||
@@ -10,9 +10,9 @@
|
||||
#include "Python.h"
|
||||
|
||||
@@ -28,9 +28,9 @@ diff -Naur Python-3.5.0-orig/Include/pgenheaders.h Python-3.5.0/Include/pgenhead
|
||||
|
||||
#define addarc _Py_addarc
|
||||
#define addbit _Py_addbit
|
||||
diff -Naur Python-3.5.0-orig/Include/pyerrors.h Python-3.5.0/Include/pyerrors.h
|
||||
--- Python-3.5.0-orig/Include/pyerrors.h 2015-09-13 14:41:20.000000000 +0300
|
||||
+++ Python-3.5.0/Include/pyerrors.h 2015-09-21 13:42:43.945474400 +0300
|
||||
diff -Naur Python-3.5.2-orig/Include/pyerrors.h Python-3.5.2/Include/pyerrors.h
|
||||
--- Python-3.5.2-orig/Include/pyerrors.h 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Include/pyerrors.h 2016-07-12 14:22:46.665800700 +0300
|
||||
@@ -465,9 +465,9 @@
|
||||
|
||||
#include <stdarg.h>
|
||||
@@ -43,9 +43,9 @@ diff -Naur Python-3.5.0-orig/Include/pyerrors.h Python-3.5.0/Include/pyerrors.h
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
diff -Naur Python-3.5.0-orig/Include/sysmodule.h Python-3.5.0/Include/sysmodule.h
|
||||
--- Python-3.5.0-orig/Include/sysmodule.h 2015-09-13 14:41:20.000000000 +0300
|
||||
+++ Python-3.5.0/Include/sysmodule.h 2015-09-21 13:42:43.963535200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Include/sysmodule.h Python-3.5.2/Include/sysmodule.h
|
||||
--- Python-3.5.2-orig/Include/sysmodule.h 2016-06-26 00:38:35.000000000 +0300
|
||||
+++ Python-3.5.2/Include/sysmodule.h 2016-07-12 14:22:46.690800700 +0300
|
||||
@@ -19,9 +19,9 @@
|
||||
PyAPI_FUNC(void) PySys_SetPath(const wchar_t *);
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Include/pylifecycle.h Python-3.5.0/Include/pylifecycle.h
|
||||
--- Python-3.5.0-orig/Include/pylifecycle.h 2015-09-21 13:42:04.489399200 +0300
|
||||
+++ Python-3.5.0/Include/pylifecycle.h 2015-09-21 13:42:45.489672800 +0300
|
||||
diff -Naur Python-3.5.2-orig/Include/pylifecycle.h Python-3.5.2/Include/pylifecycle.h
|
||||
--- Python-3.5.2-orig/Include/pylifecycle.h 2016-07-12 14:21:59.900800700 +0300
|
||||
+++ Python-3.5.2/Include/pylifecycle.h 2016-07-12 14:22:48.365800700 +0300
|
||||
@@ -65,7 +65,7 @@
|
||||
PyAPI_FUNC(wchar_t *) Py_GetPath(void);
|
||||
PyAPI_FUNC(void) Py_SetPath(const wchar_t *);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/ssl.py Python-3.5.0/Lib/ssl.py
|
||||
--- Python-3.5.0-orig/Lib/ssl.py 2015-09-13 14:41:21.000000000 +0300
|
||||
+++ Python-3.5.0/Lib/ssl.py 2015-09-21 13:42:46.889384800 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/ssl.py Python-3.5.2/Lib/ssl.py
|
||||
--- Python-3.5.2-orig/Lib/ssl.py 2016-06-26 00:38:36.000000000 +0300
|
||||
+++ Python-3.5.2/Lib/ssl.py 2016-07-12 14:22:50.005300700 +0300
|
||||
@@ -138,7 +138,7 @@
|
||||
except NameError:
|
||||
_SSLv2_IF_EXISTS = None
|
||||
@@ -10,7 +10,7 @@ diff -Naur Python-3.5.0-orig/Lib/ssl.py Python-3.5.0/Lib/ssl.py
|
||||
from _ssl import enum_certificates, enum_crls
|
||||
|
||||
from socket import socket, AF_INET, SOCK_STREAM, create_connection
|
||||
@@ -416,7 +416,7 @@
|
||||
@@ -421,7 +421,7 @@
|
||||
def load_default_certs(self, purpose=Purpose.SERVER_AUTH):
|
||||
if not isinstance(purpose, _ASN1Object):
|
||||
raise TypeError(purpose)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py 2015-09-21 13:42:15.483911200 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/cygwinccompiler.py 2015-09-21 13:42:48.326347200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/cygwinccompiler.py Python-3.5.2/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/cygwinccompiler.py 2016-07-12 14:22:13.375300700 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/cygwinccompiler.py 2016-07-12 14:22:51.701800700 +0300
|
||||
@@ -305,9 +305,9 @@
|
||||
raise CCompilerError(
|
||||
'Cygwin gcc cannot be used with --compiler=mingw32')
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py 2015-09-21 13:42:49.604148800 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/cygwinccompiler.py 2015-09-21 13:42:49.741862400 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/cygwinccompiler.py Python-3.5.2/Lib/distutils/cygwinccompiler.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/cygwinccompiler.py 2016-07-12 14:22:53.156800700 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/cygwinccompiler.py 2016-07-12 14:22:53.401300700 +0300
|
||||
@@ -238,7 +238,7 @@
|
||||
# (On my machine: 10KB < stripped_file < ??100KB
|
||||
# unstripped_file = stripped_file + XXX KB
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Python/sysmodule.c Python-3.5.0/Python/sysmodule.c
|
||||
--- Python-3.5.0-orig/Python/sysmodule.c 2015-09-21 13:42:04.576316800 +0300
|
||||
+++ Python-3.5.0/Python/sysmodule.c 2015-09-21 13:42:51.105452800 +0300
|
||||
diff -Naur Python-3.5.2-orig/Python/sysmodule.c Python-3.5.2/Python/sysmodule.c
|
||||
--- Python-3.5.2-orig/Python/sysmodule.c 2016-07-12 14:22:00.012800700 +0300
|
||||
+++ Python-3.5.2/Python/sysmodule.c 2016-07-12 14:22:55.046300700 +0300
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <windows.h>
|
||||
#endif /* MS_WINDOWS */
|
||||
@@ -10,7 +10,7 @@ diff -Naur Python-3.5.0-orig/Python/sysmodule.c Python-3.5.0/Python/sysmodule.c
|
||||
extern void *PyWin_DLLhModule;
|
||||
/* A string loaded from the DLL at startup: */
|
||||
extern const char *PyWin_DLLVersionString;
|
||||
@@ -1803,7 +1803,7 @@
|
||||
@@ -1826,7 +1826,7 @@
|
||||
PyUnicode_FromString("little"));
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/Lib/distutils/command/build_ext.py Python-3.5.0/Lib/distutils/command/build_ext.py
|
||||
--- Python-3.5.0-orig/Lib/distutils/command/build_ext.py 2015-09-21 13:42:13.376441600 +0300
|
||||
+++ Python-3.5.0/Lib/distutils/command/build_ext.py 2015-09-21 13:42:52.531127200 +0300
|
||||
diff -Naur Python-3.5.2-orig/Lib/distutils/command/build_ext.py Python-3.5.2/Lib/distutils/command/build_ext.py
|
||||
--- Python-3.5.2-orig/Lib/distutils/command/build_ext.py 2016-07-12 14:22:11.418300700 +0300
|
||||
+++ Python-3.5.2/Lib/distutils/command/build_ext.py 2016-07-12 14:22:56.843300700 +0300
|
||||
@@ -216,7 +216,7 @@
|
||||
|
||||
# for extensions under Cygwin and AtheOS Python's library directory must be
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py
|
||||
--- Python-3.5.0-orig/setup.py 2015-09-21 13:42:34.882339200 +0300
|
||||
+++ Python-3.5.0/setup.py 2015-09-21 13:42:53.935354400 +0300
|
||||
@@ -1632,6 +1632,10 @@
|
||||
diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py
|
||||
--- Python-3.5.2-orig/setup.py 2016-07-12 14:22:36.178300700 +0300
|
||||
+++ Python-3.5.2/setup.py 2016-07-12 14:22:58.502800700 +0300
|
||||
@@ -1658,6 +1658,10 @@
|
||||
'-framework', 'CoreFoundation',
|
||||
]))
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
--- Python-3.5.0/Include/pyport.h.orig 2015-10-05 01:44:27.804874500 +0100
|
||||
+++ Python-3.5.0/Include/pyport.h 2015-10-05 02:07:01.998193900 +0100
|
||||
diff -Naur Python-3.5.2-orig/Include/pyport.h Python-3.5.2/Include/pyport.h
|
||||
--- Python-3.5.2-orig/Include/pyport.h 2016-07-12 14:22:15.265300700 +0300
|
||||
+++ Python-3.5.2/Include/pyport.h 2016-07-12 14:23:00.197800700 +0300
|
||||
@@ -896,7 +896,7 @@
|
||||
#define PY_LITTLE_ENDIAN 1
|
||||
#endif
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
--- Python-3.5.0/Python/pytime.c.orig 2015-10-05 21:30:23.839918600 +0100
|
||||
+++ Python-3.5.0/Python/pytime.c 2015-10-05 21:30:28.078842500 +0100
|
||||
@@ -435,7 +435,7 @@
|
||||
diff -Naur Python-3.5.2-orig/Python/pytime.c Python-3.5.2/Python/pytime.c
|
||||
--- Python-3.5.2-orig/Python/pytime.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Python/pytime.c 2016-07-12 14:23:01.904300700 +0300
|
||||
@@ -463,7 +463,7 @@
|
||||
/* 11,644,473,600,000,000,000: number of nanoseconds between
|
||||
the 1st january 1601 and the 1st january 1970 (369 years + 89 leap
|
||||
days). */
|
||||
@@ -9,8 +10,8 @@
|
||||
if (info) {
|
||||
DWORD timeAdjustment, timeIncrement;
|
||||
BOOL isTimeAdjustmentDisabled, ok;
|
||||
@@ -529,6 +529,34 @@
|
||||
return pygettimeofday_new(t, info, 1);
|
||||
@@ -557,6 +557,34 @@
|
||||
return pygettimeofday(t, info, 1);
|
||||
}
|
||||
|
||||
+#if defined(MS_WINDOWS) && _WIN32_WINNT < 0x0600
|
||||
@@ -43,4 +44,4 @@
|
||||
+#endif
|
||||
|
||||
static int
|
||||
pymonotonic_new(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
|
||||
pymonotonic(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
--- Python-3.5.0/Modules/posixmodule.c.orig 2015-10-05 21:34:15.284022500 +0100
|
||||
+++ Python-3.5.0/Modules/posixmodule.c 2015-10-05 21:34:18.082536800 +0100
|
||||
@@ -1462,6 +1462,31 @@
|
||||
diff -Naur Python-3.5.2-orig/Modules/posixmodule.c Python-3.5.2/Modules/posixmodule.c
|
||||
--- Python-3.5.2-orig/Modules/posixmodule.c 2016-07-12 14:22:01.940300700 +0300
|
||||
+++ Python-3.5.2/Modules/posixmodule.c 2016-07-12 14:23:03.682800700 +0300
|
||||
@@ -1464,6 +1464,31 @@
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -32,7 +33,7 @@
|
||||
static BOOL
|
||||
get_target_path(HANDLE hdl, wchar_t **target_path)
|
||||
{
|
||||
@@ -1470,8 +1495,8 @@
|
||||
@@ -1472,8 +1497,8 @@
|
||||
|
||||
/* We have a good handle to the target, use it to determine
|
||||
the target path name (then we'll call lstat on it). */
|
||||
@@ -43,7 +44,7 @@
|
||||
if(!buf_size)
|
||||
return FALSE;
|
||||
|
||||
@@ -1481,7 +1506,7 @@
|
||||
@@ -1483,7 +1508,7 @@
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -52,7 +53,7 @@
|
||||
buf, buf_size, VOLUME_NAME_DOS);
|
||||
|
||||
if(!result_length) {
|
||||
@@ -1514,6 +1539,12 @@
|
||||
@@ -1516,6 +1541,12 @@
|
||||
wchar_t *target_path;
|
||||
const char *dot;
|
||||
|
||||
@@ -65,7 +66,7 @@
|
||||
hFile = CreateFileA(
|
||||
path,
|
||||
FILE_READ_ATTRIBUTES, /* desired access */
|
||||
@@ -1604,6 +1635,12 @@
|
||||
@@ -1606,6 +1637,12 @@
|
||||
wchar_t *target_path;
|
||||
const wchar_t *dot;
|
||||
|
||||
@@ -78,7 +79,7 @@
|
||||
hFile = CreateFileW(
|
||||
path,
|
||||
FILE_READ_ATTRIBUTES, /* desired access */
|
||||
@@ -3846,6 +3883,13 @@
|
||||
@@ -3848,6 +3885,13 @@
|
||||
if (path_wchar == NULL)
|
||||
return NULL;
|
||||
|
||||
@@ -92,7 +93,7 @@
|
||||
hFile = CreateFileW(
|
||||
path_wchar,
|
||||
0, /* desired access */
|
||||
@@ -3861,7 +3905,7 @@
|
||||
@@ -3863,7 +3907,7 @@
|
||||
|
||||
/* We have a good handle to the target, use it to determine the
|
||||
target path name. */
|
||||
@@ -101,7 +102,7 @@
|
||||
|
||||
if(!buf_size)
|
||||
return win32_error_object("GetFinalPathNameByHandle", path);
|
||||
@@ -3870,8 +3914,8 @@
|
||||
@@ -3872,8 +3916,8 @@
|
||||
if(!target_path)
|
||||
return PyErr_NoMemory();
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
--- Python-3.5.0/Python/getcompiler.c.orig 2015-05-23 17:09:24.000000000 +0100
|
||||
+++ Python-3.5.0/Python/getcompiler.c 2016-01-02 15:13:57.737265800 +0000
|
||||
diff -Naur Python-3.5.2-orig/Python/getcompiler.c Python-3.5.2/Python/getcompiler.c
|
||||
--- Python-3.5.2-orig/Python/getcompiler.c 2016-06-26 00:38:38.000000000 +0300
|
||||
+++ Python-3.5.2/Python/getcompiler.c 2016-07-12 14:23:05.404300700 +0300
|
||||
@@ -6,7 +6,22 @@
|
||||
#ifndef COMPILER
|
||||
|
||||
|
||||
19
mingw-w64-python3/0980-mingw-readline-features-skip.patch
Normal file
19
mingw-w64-python3/0980-mingw-readline-features-skip.patch
Normal file
@@ -0,0 +1,19 @@
|
||||
--- Python-3.5.2-orig/configure.ac 2016-07-12 14:36:23.497300700 +0300
|
||||
+++ Python-3.5.2/configure.ac 2016-07-12 14:37:23.329800700 +0300
|
||||
@@ -4911,9 +4911,16 @@
|
||||
[Define if you have readline 4.0]), ,$READLINE_LIBS)
|
||||
|
||||
# also in 4.0, but not in editline
|
||||
+case $host in
|
||||
+ *-*-mingw*)
|
||||
+ dnl Windows don't have resize terminal signal.
|
||||
+ ;;
|
||||
+ *)
|
||||
AC_CHECK_LIB(readline, rl_resize_terminal,
|
||||
AC_DEFINE(HAVE_RL_RESIZE_TERMINAL, 1,
|
||||
[Define if you have readline 4.0]), ,$READLINE_LIBS)
|
||||
+ ;;
|
||||
+esac
|
||||
|
||||
# check for readline 4.2
|
||||
AC_CHECK_LIB(readline, rl_completion_matches,
|
||||
@@ -1,16 +0,0 @@
|
||||
diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmodule.c
|
||||
--- Python-3.5.0-orig/Modules/posixmodule.c 2015-09-21 13:42:06.149864000 +0300
|
||||
+++ Python-3.5.0/Modules/posixmodule.c 2015-09-21 13:42:55.398279200 +0300
|
||||
@@ -1370,10 +1370,10 @@
|
||||
|
||||
if(!SetCurrentDirectoryW(path))
|
||||
return FALSE;
|
||||
- result = GetCurrentDirectoryW(Py_ARRAY_LENGTH(new_path), new_path);
|
||||
+ result = GetCurrentDirectoryW(Py_ARRAY_LENGTH(_new_path), new_path);
|
||||
if (!result)
|
||||
return FALSE;
|
||||
- if (result > Py_ARRAY_LENGTH(new_path)) {
|
||||
+ if (result > Py_ARRAY_LENGTH(_new_path)) {
|
||||
new_path = PyMem_RawMalloc(result * sizeof(wchar_t));
|
||||
if (!new_path) {
|
||||
SetLastError(ERROR_OUTOFMEMORY);
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
|
||||
--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:42:31.879731200 +0300
|
||||
+++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:56.820567200 +0300
|
||||
@@ -1219,6 +1219,7 @@
|
||||
diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in
|
||||
--- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:22:32.838800700 +0300
|
||||
+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:23:07.018300700 +0300
|
||||
@@ -1260,6 +1260,7 @@
|
||||
test/test_importlib/extension test/test_importlib/frozen \
|
||||
test/test_importlib/import_ test/test_importlib/source \
|
||||
turtledemo \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
--- Python-3.5.0-orig/Modules/getpath.c 2015-09-21 13:42:36.358809600 +0300
|
||||
+++ Python-3.5.0/Modules/getpath.c 2015-09-21 13:42:58.274461600 +0300
|
||||
@@ -973,6 +973,17 @@
|
||||
diff -Naur Python-3.5.2-orig/Modules/getpath.c Python-3.5.2/Modules/getpath.c
|
||||
--- Python-3.5.2-orig/Modules/getpath.c 2016-07-12 14:22:37.874800700 +0300
|
||||
+++ Python-3.5.2/Modules/getpath.c 2016-07-12 14:23:08.724800700 +0300
|
||||
@@ -956,6 +956,17 @@
|
||||
int
|
||||
_Py_CheckPython3()
|
||||
{
|
||||
@@ -19,7 +19,7 @@ diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
|
||||
wchar_t py3path[MAXPATHLEN+1];
|
||||
wchar_t *s;
|
||||
if (python3_checked)
|
||||
@@ -997,6 +1008,7 @@
|
||||
@@ -980,6 +991,7 @@
|
||||
wcscat(py3path, L"\\DLLs\\python3.dll");
|
||||
hPython3 = LoadLibraryExW(py3path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
|
||||
return hPython3 != NULL;
|
||||
|
||||
@@ -17,8 +17,8 @@ _realname=python3
|
||||
pkgbase="mingw-w64-${_realname}"
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
_pybasever=3.5
|
||||
pkgver=${_pybasever}.0
|
||||
pkgrel=6
|
||||
pkgver=${_pybasever}.2
|
||||
pkgrel=1
|
||||
pkgdesc="A high-level scripting language (mingw-w64)"
|
||||
arch=('any')
|
||||
license=('PSF')
|
||||
@@ -124,8 +124,7 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
|
||||
0950-mingw-w64-XP3-compat-GetProcAddress-GetTickCount64.patch
|
||||
0960-mingw-w64-XP3-compat-GetProcAddress-GetFinalPathNameByHandleW.patch
|
||||
0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch
|
||||
|
||||
1000-fix-building-posixmodule.patch
|
||||
0980-mingw-readline-features-skip.patch
|
||||
1010-install-msilib.patch
|
||||
1500-mingw-w64-dont-look-in-DLLs-folder-for-python-dll.patch)
|
||||
|
||||
@@ -231,8 +230,8 @@ prepare() {
|
||||
patch -Np1 -i "${srcdir}"/0950-mingw-w64-XP3-compat-GetProcAddress-GetTickCount64.patch
|
||||
patch -Np1 -i "${srcdir}"/0960-mingw-w64-XP3-compat-GetProcAddress-GetFinalPathNameByHandleW.patch
|
||||
patch -Np1 -i "${srcdir}"/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch
|
||||
patch -Np1 -i "${srcdir}"/0980-mingw-readline-features-skip.patch
|
||||
|
||||
patch -Np1 -i "${srcdir}"/1000-fix-building-posixmodule.patch
|
||||
patch -Np1 -i "${srcdir}"/1010-install-msilib.patch
|
||||
|
||||
plain "Apply patch contributed by Frode Solheim from FS-UAE project (1)"
|
||||
@@ -388,92 +387,92 @@ package() {
|
||||
mv "${pkgdir}"${MINGW_PREFIX}/bin/${_exename}_exe "${pkgdir}"${MINGW_PREFIX}/bin/${_exename}.exe
|
||||
}
|
||||
|
||||
sha256sums=('d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91'
|
||||
'050d4df095c1a99d58539a434b1f4cb43565bc9a5f26a2e2c93ac3f4dfded789'
|
||||
'd1c1305bc0a0aee63be7784fdca5df2e4fc641a96dc680ce4b63ab841a9b87c2'
|
||||
'589a9fb0b33227c51798b79a553d8b7b94ac0391edcdadd4c669348ff0f87169'
|
||||
'6f85175d696c6aebd197c49a15de46068ed7a10c74230b84325a27e13e47ea45'
|
||||
'8d7b2fdc82236f9a99cf4c99f4e7743166cdd3d5a97803be7bfe3fda47e3bcb6'
|
||||
'613c9a0ceb62f287d7f28db23a87a3754341afffce7c4251d4197175859247da'
|
||||
'3a354f823ce9bf91451eb0a4af218585745170431b5c7223a82a659c7d239e8a'
|
||||
'bc2a5af5b6bc33e7a9e960de204a7451ff12a11edab35ce17fca7e8126b2ebd6'
|
||||
'a43a0a3d341356fbc0b9c12ca33f44bb2d3e04cc497bb61fdceb671ae72ecbe8'
|
||||
'804067a3b811f7a0cf614f9801163c7ec249c3147e64a7fff26b51706393d51c'
|
||||
'7fc0f8da09c85862f40b016c7d52435e4b4160e1d13f3d2c21932964238ecdb8'
|
||||
'91fe2ebe2ff629cd8178cc4f4bf7b2834ebe8ae8c7fbde79b79542b4ef658649'
|
||||
'05b3c94a8a51ba5a5fa2b05679266dd69e451464d7ef384df9749057fcbab4ed'
|
||||
'ab58503398f596a4df84c701b509b027eee63a55205f4673d1742a8e8899e2fe'
|
||||
'c89f8a77e53af7ca905d69b1fa64fafc5df18a1d50688242de42e219e04059ad'
|
||||
'10569caa75d0cc61d071f9d67a8002ca30b9a64e5d39b67ccd7c033035b7ba38'
|
||||
'a0230b6aeb92e2ec06f27908545bec97fa609d9169ca9bb62da842ef39a0b368'
|
||||
'16eb62b2eb6e2e13c11248c829266e27a9c6b5482b006726c092eb839dfc8d23'
|
||||
'34d07963147175ea5d47523be36ab4a3d14e110882d4afff26631633b151d2b4'
|
||||
'c71410cd9cb59a7891aaa2baa9e36dfade20bbd751e19ba6e38665a5c83a3d9f'
|
||||
'ed129d79a575b5845b509d7ca5f3eb2a4b8370eda2d4c18115f663f4ef422ebf'
|
||||
'c9eaa12af6724441c624eb261e55d0b3feb0fbac86669bbbf028e327fda6a342'
|
||||
'16a442901c41d0f8a1dda75dc12f384e66078f2a5afa8beda3a55719af9e9174'
|
||||
'd7d255cf5d02b4106c1fc325e2f1df153d2ff925cbab5cf457b93f7c2d844797'
|
||||
'aa913e414085f9d56e4777ca7dbf594b46100dbca85fa1ba2a7a2dc3ae23bf64'
|
||||
'66ea08dae8bc0e42caa096573dbd2e8256bf32f38ddc4510b84b13a44f92a7fa'
|
||||
'dc8cc3dae562a5fd179eee8ed7a435062fd7e48fb09a5762552abfcc09588a22'
|
||||
'da77782f82d4a27d2afacf5e0e2119dbd3c22de9bcc29e753c1fd17b50fbae23'
|
||||
'99ac050e425be6374546b6285888ea4e6b35c2abc88252d6956a1368d6ab984a'
|
||||
'6e5f76535a918bec5af55d13509ccaff0d0691b612161e3473dddd3e1efb4adc'
|
||||
'6360307d8aaf915569be6f5f3a77277fe45c32b166bcd187bdc772b9f53c96d6'
|
||||
'5ea5be8dc21edb30ee4b3b2810428a168ca1058aa1667aee9af5f69345a53291'
|
||||
'1abe59040c10900cdcf8610cb0445cbd8f5596f43243c4a3cbe644ff4850c1ae'
|
||||
'83d220321982d7d32ddd2cc88841cc9c900b2d23a1a649142c47410e26325cd6'
|
||||
'68fbca848fa752a4ea300a7a058083ddc1fcd849f5a87b6fe47c2a0fd46ed2e6'
|
||||
'2e5b5daad2f3da6dd88871cc7e16a030ecf68c92c00cec050e8b8baa4a404b1f'
|
||||
'c5b370d486618e1f0e980a216c5f656020cf4d06e3b88fcba172e2669cbd27d0'
|
||||
'919c49bf89f9c7cd72d180265b7abd730199d086e6ca65bb81224a2f6faf07e8'
|
||||
'b37a90e3d60bafe2c0fc22152cc8c6639d04bff37329e4fe48aca4e4f31b4d64'
|
||||
'e6728aa72e83c09d7b6a90084bdb907c90139f3467acf741568e1986ad74587e'
|
||||
'baadca7907f54d2619cb3f319ec79de3e056c3a078dd0c7135f5458c99c17d97'
|
||||
'0f12fba4ad8595d2ecc4b1044d0616fbe62c5492f393255e63094612ffdf2e0c'
|
||||
'80e9dbe1437a451a8f44d71eb4a1137cf0fd1d828dd78cd97979a56a16e28d6a'
|
||||
'4cf7a1ca7465c8e236c7320b7d2689994b9e66bc76c2d7f4e322665fa78596b1'
|
||||
'a0aed749a2b9e1413aeb18aad67d016b3abaf6e869085ee15d3ab53918327068'
|
||||
'c9044d4836910c2aea38a4bda3f1f61ec4bedacffadc43b9c432025d0e3f548a'
|
||||
'6f741dfeb628f9fe54da57c78ff817bf6accebb2718983877809ada4714825fc'
|
||||
'e9aec5536a42d669313370a9bc96c2984a3e32b47157c8cd52f71edf1b5c5662'
|
||||
'798d389d9dfeff97f51c7d0749bcd93a112c1a39101c1a15904a7c36c6f609bf'
|
||||
'baaee01d83f252297a538cfbef6d19feadf3dcd9315835da3de8a5c7e559ffbd'
|
||||
'a6281c3f3e5f33f1be1eb969be298fb317e0e74197afdb42caca6389cb7bfa6d'
|
||||
'c35bdb99a6e7a483e4683c85113dc4f82078b1fcd7d6915b40e0e996102ecdb0'
|
||||
'2a9f9fd3beb42c30cac5c7171c0c580ea37ed249abf963bc8d9ceeb6e620d2aa'
|
||||
'6afa417385e35ee75e5a2d5dbbd6bb89d6870f31c5dff9f9922a241acc1a3f45'
|
||||
'9a8e4ca159a3c5efe2f3153972780b7237fe42439bf9c862d02d6f6daef003d3'
|
||||
'f89108dfdd77858d217065517446e9daad2b41f07f7107b994ec64d98256a7eb'
|
||||
'029c2b1171366a8fb913505f3a0ffc9b31818a38084736fb419e23cbe3b45c33'
|
||||
'a3eff807c221949810afb4d5e3cdf7b8ab86d447545c21f9099807d68a5f904b'
|
||||
'80d6d2abd6ee964ed3c3cd27b09d4d218ea9e320d60a805f282d4d1cbfbb88fe'
|
||||
'7d89363c31a474bcccb0a649f9c7cd4a28d7d6f4b23014da99e3bae76d29d11b'
|
||||
'97cc7070a1f7b3bcbb986ec070a2087eac2541f548d6264fbbd65f2f55edc370'
|
||||
'455843d9bb86dd98da0284dfa8d09753b614d09e1175d05eb0e61559b5c9fd40'
|
||||
'23ba3daa4fcee2a9e3cd0d74310c3663698958627afe5536041318789662d033'
|
||||
'3667d5e2911b87d321bbd1023968936bd75ade1245ef0a60097f40de39bef6d7'
|
||||
'a192e4c8d8812fe46098884f47ccbc78af010288ce6ddca438a6057bc706bf3b'
|
||||
'3d81e6c5bfd3f43f45e014c54ea77d04c5fbda632ad55112ac693e2d9b1d83fb'
|
||||
'3cc298162cd3ef8b94f18882a7328a8ad967c8828b401b063465e7d060c85bc1'
|
||||
'654fda52074996a13f4e4616f0c13eb0794de61cbfb5681a12f6b76c360da135'
|
||||
'e775aeaa810617473d35a09a84801bda69d735a0872b8c64b8ddd1c8be881419'
|
||||
'ad10c4f3b29c3b361b2117845000dc2dbd52b3050b2b595b6ac75c8457fbce10'
|
||||
'166acf7cceee42345a7bcc409efbf0ede98309943dbb9f3edce9cc794c9f74c2'
|
||||
'd6b2ca190ce7351253fd9dda7c212aea81eb53ee776486ec4d52c22dd5effa09'
|
||||
'c2ee4e1914cfadbed162c274c5f21338af84fc9f1d00e0e8ef95b3d4289f776f'
|
||||
'1a5f8c5b7a39e56ec32ea5ad46ceb42ee35ef62cf70e777abbf95c14834604ca'
|
||||
'4a1d35f02a087f3d54e7ce3e011b13cdff85bf90e85dd4e1641b039b2bfa88bf'
|
||||
'78c206ff396346b018b0b4519778c9296c5e95bbf915d12c3dbf685cff92ab9a'
|
||||
'f7451dfe4beb8f2d33706b5ea58bcf962659f320b57f616fbda1b4acc02490f8'
|
||||
'9931579c365cc16e8604737e2604511d7b96671fc81992dd2d5e3844852f8585'
|
||||
'1c63cd86d5da3c55905451857c689738b42789c47eb61e154731736c84c0c897'
|
||||
'000ae4b74abb293a106ee6906898dc3465e14e8bb3cf3b0e015250362b3bffaa'
|
||||
'2ab577aafd0bcb788b29dc042fe89333335d7fdb2606ba5186c9e5dae749d341'
|
||||
'ff2fbe681d526fd6ef33bd28b1e9c8a05274fd3d5ca09f8b487cce98655b8062'
|
||||
'b69072365ce0011ff7aea4bee13a0ad545c99e85e1064a204dcc651718529e06'
|
||||
'899cdbe084c04b389754828f379e917ddea802f38ba97a69de4f75c12ccc0279'
|
||||
'5ce3b7fc5ad0a51cc688ea3615ef2355bf521c031e89920f705762968addee7e'
|
||||
'0f95f50b9cfc1991668cc60a85a2e9cd7a73f6713dbaa620a396b7ae2fb7faf1'
|
||||
'49d4fdbbc160eac5f2edaa5a36e6be476ac7d71035bdc821d25b06f3f96fb4c6'
|
||||
'213f72830dd0c9a057d9fc59506ec4eb9eeb44ed418282ac5402fec76120b0f4')
|
||||
sha256sums=('0010f56100b9b74259ebcd5d4b295a32324b58b517403a10d1a2aa7cb22bca40'
|
||||
'4cc654f8caef73b385a57278d4a57578941ec48a5a69bcf7f100f85a5c9e5ac0'
|
||||
'166e45a247f440df92c97d3e4392daf67c79d086b3de8ff4f4698d113bad4172'
|
||||
'010639b0e250a5aa8ece1f44a30c29e4a8d2e38bc48345c53a2f1f216bac668f'
|
||||
'249ae89279ecace5c522279f613a9f5edbb76fe89811e376a195df51c2dc263e'
|
||||
'f63b7213ef0c360969ce84bb4e91f95f98a360451688f1193b30cd8a2073dbd1'
|
||||
'04798443a7b121d3098684e05a815e9a6f501106b02f8a21e4dc043d7a297678'
|
||||
'2d70d39c557f455d3a4d96272886fa1c8b1fadf2da3ece72f76e53a751d23661'
|
||||
'aa8f63c82a39f6bf4dc3b1c74e6dab999f38b978de690fcd5bef43bc2a582025'
|
||||
'889bb9291457f6fcab8e27793cf4abd6ceae59898594580174e26287a0118237'
|
||||
'3394c37ea4182786095216092c49bfd3d4418fb5c1598686c93d8515624b5cbd'
|
||||
'32b1a3a6ffa3eda9840c67a29fd6098caba530a92f19d56128fa61aaa83a4f6a'
|
||||
'6c367976c39dba142323f005841843cba52475cc99bfc741843f0faaa6cc86e9'
|
||||
'711b45588efa31313564e2d784b1eeddcfc2468da7b7dd14583a0f45ff2060fb'
|
||||
'3aca98254267c1fa48297e231c4efaf038a2cfa29cb555af623ca6c67fdb2b74'
|
||||
'4157c6ac294b49d34f1c122cd4ecd3afe78573615986d175b2234af5e801db0c'
|
||||
'83bf053e9bbea0f5cc116ebc478e92948df4019a4ab7241ff2aa6c880770af72'
|
||||
'6250565f6f1a1e907a1778f1fdc033f78cca0770d4ff0451aa5de10e32f9297d'
|
||||
'360980a89a2fcc7b13ac1a6ce8425bb37fefe768a89de6cdc8aa91aa17d16942'
|
||||
'a54870ec01b827b2fad052a3aad5bcf29db45556799dc15773a66b0aacec3a11'
|
||||
'060bf30d475522dbb3d40d20da9bf1e3dfa0806c8d436cdc8a73480c5900963d'
|
||||
'af51615b98a7f96ca4639cbc80e9c3725fcbbbe2cd9951fafa7ad523ee173228'
|
||||
'74087a1c409ab24403079d7989efe887f04b1072fd1cfa834d5815067e11fea3'
|
||||
'a91e12c6cb1be70355f2108388291f56ce5e1ac22fde92a2c1cb2c2cb1f1fe2e'
|
||||
'd4ae0fdf5ba2c0d1994e2c2b5377d423854033243e874649e1eba6a2ab9f679d'
|
||||
'd62ed216701bf082b91a673f0ed354e6af8fd2b88ff9f568e98a1199bef51635'
|
||||
'1bf3e3f0d0cfa4b711570e01d4f5720caa050fcfff0f41b023604db0bfcc00ae'
|
||||
'e5015d0dc5983a56ce3deb08b75c78210cfe207077f8e470fa70c0c33b352c95'
|
||||
'530f69c113aeb0c9931c409a55083726d6ad48b7cce5535b762121b894a15312'
|
||||
'7d24d510b5a8ef980cb44cdd0ef8bb838f3e73d2b4c41017b2f5b7802c2e72d0'
|
||||
'8557962bf70d3c913495d07a22b801fed075b5ecbb487261b26a4214247356de'
|
||||
'4f3e05d6e0524fcb165ff7992075bc7da90fbe345a1ef3310f0b7b529026dbbc'
|
||||
'12822e67b10922d0f718da2acd693bd566ce53df0b475c5dcb9029da2535d8c1'
|
||||
'e1ffde6ec0cfcc45db91cd16a519394efb4ad84623b94edddce18ceb90d7a1ac'
|
||||
'705596440ecc67a35ec18d536afc4318d28bdaddb38c508736d8916598cb372f'
|
||||
'85a2da84ceabc8093f927377514f3823c1c9a6b54dfd5a6a11ce95dbf1c67324'
|
||||
'b51406cb38f70b4e812c3b015d7102a6b11255e302d57da7c4198dffe875d07e'
|
||||
'64f9b871b980a43f302d2b225b4ce08530b2d734c9199185563e100b1a7fb7bc'
|
||||
'ec6a51890d51da924544f26f055e01040111e9847b0c40448a7e4e017493e9a0'
|
||||
'78dc2ac8eaaccf19fc42551e784f01f2f147785814bfc68d891957ba35b5d866'
|
||||
'5c181aaa52d1cbe42d7538af85f08362bca969678c2c83cd1855fdaf1bb401fd'
|
||||
'fb874e1a19b2c8f9498896796d20cc472e2e93bdc6ad8c9c2af2b0367a7d160f'
|
||||
'fd5a7ae2860b98086875d3a61ced283333b47b1d64765624fb75167718ad5b33'
|
||||
'1bcc89ed500f114be330721ad0dbb9a213a2f959ab942375ddecb08f142a196c'
|
||||
'fe4a73c72e29dc508ecdc8467778392f751504b68be8217c8ce95c898db5ab77'
|
||||
'ab6d2450495212d7c402bd5a9a4fc64527ee54a9509825ba62312f13e1252a8a'
|
||||
'7ab2a3a15148a4f90d45f4dbc8181f2433e0354f25b7a0de87e4cdfc06a3ed83'
|
||||
'93e051997b9fe8417628ffb3c2b90a4e8aa7e38aa5f397a0f93922ff0888d760'
|
||||
'a04d79ede2d44eed7ab524b3792348536bd8ef6bf9758fca8e41637cdd2be8c1'
|
||||
'5a70e1dbf5c976635b35576544a33d2e69037c225c4548d51d61077f58228b18'
|
||||
'faa3389ddc8d927eb08b447066e3cc21486376e517ccad4a5e2f0300daa9f15a'
|
||||
'32c28c540d641d2d796582352507fc8377b8b757a794a293cc961148c2412bb1'
|
||||
'863c702bb201c38241738758dcbe94b989d043917956e8af38035210da1a47b3'
|
||||
'23dbf79f9c0780d175f5c23bdc2d6d891ab354f4432dee14a2806c3cd546a90a'
|
||||
'6f8c7dd8f690de30f7219b23823bcf7a1289e8163e174c1cd135f70d746eb2d1'
|
||||
'2c7ecd5eb38cef54e64d5cf5e34d61451f0ed437d776a978b7a4a4c2f88eb206'
|
||||
'ac10b20ffcf652e26575c376825ee41d94dae1c9ea36fd9e0106122e6ebc3f4f'
|
||||
'315c357dcd91fb1f34dcaf1c6d4cf2a23e7101931e55f4cb0793936bf7dbb606'
|
||||
'bc440ca4748fd2559c39c516b3e0d70d5e58d0e9a2af995f019ddbd6d61fcd88'
|
||||
'a4053159e3b64517c1006ec0ecc43588e8d28111e8251b9b7348cf696dbc1afa'
|
||||
'66db319cdba1ee487e3f402c0cd47491dc4935f2386d612f755ef0718003b2ac'
|
||||
'f643831842e9c2c15f1ecb3ec96022f6f32af2a88e0e4501e56b20d86905995d'
|
||||
'faf18878d93b71c9b3034b2e0be7e75d0a105734726872f1353e2afa8664e7aa'
|
||||
'8e1a66af0edb1207a27af05c8e4250bc3b02a6dc39bae2c36a313b48fae3c4e6'
|
||||
'81a88720512c311515107607447d2c8faa8a7158ebc28232a8d19fe27b905836'
|
||||
'15c0e054789e54794f1f7a13e7da844e392e42327f57d960665409503647ec28'
|
||||
'ceea443a47860778d096a4b1c644467f61f3afb135b20c9a8019242d1fc6c175'
|
||||
'70db4d3c3c05926d2460b6cb671f0f39819fa1a2e3af7a17fb58df00156872e1'
|
||||
'389872855584a1a912f3833c99a318bd924bee25ed806f5769c0b1c7feda1cf9'
|
||||
'10ec6c64fa8ce81f61990de03ed1dcdae8d2ddd116a394fc8ff87f6dca2e0173'
|
||||
'043568001a1717cb4e16e318001e2f707a6814b4ca223ce4bfeaccea4a565f73'
|
||||
'a56d05880a32025f9a1fc93e2b56086ff0faf7555a98d1ff80c3b641c0d65d22'
|
||||
'ef7032bc5051152e423abdb71fb26f4a33001f2167989387935af854e85e4942'
|
||||
'2ac3a4f2b6ffafb11514f7595fd9283df2cfe201abceb527baaf210bdceeafb7'
|
||||
'15c3a30def78c79ef89c611ae367e3fc2ad6d42db14275ddc897580aa0b06886'
|
||||
'3505bf06fb1ea3ef587195e01eecac8aaef803713b261066f00727dfe078b673'
|
||||
'64402d30c686d84be75800ee295c7fe37523d741403ee0cb0df5058aeab6dfa5'
|
||||
'a6334a512fd4060d534a23e9c92b9b548117832fb551ec2a4a5727e3d3fcebdd'
|
||||
'fb1d4be936d2def610a30f7a3eaeb06ef93d7734b26190ab28adee5bec81d549'
|
||||
'0e79afe46fa6f2b6f225ae06c9e849722b598946af60a62b071260458f693077'
|
||||
'2d5a5a8096854c8a568d909a93894d715b35cf16e2ec97660d24f18492d567bc'
|
||||
'0131e1e874052db20704cb20a96cd3c8bc2e6486bdf6ef1ffcff8a114ea8547e'
|
||||
'9f927224573db9e029c233f2684314dc25c65495902400f862b583c4af460893'
|
||||
'2eba5c2ae3cfa777b19d2b4db32ddee5509516f4875ce09e3ee59773e81868b2'
|
||||
'517001708adbde15fa95ed85f38b09d45bcfe3674081d0d3897356342b202145'
|
||||
'3cd8deca90db93a1087d551e37954bd7698f56e9b9b4845faa62142639327f09'
|
||||
'307aed5ea8525b41eccc15afef839519930b6d4231c1d31118ae9cceba81df95'
|
||||
'0a37c3bd9542f85b3a5e946b2c5928c3334faafa374b50bc9016a26c192a7f33'
|
||||
'66219146773e44967c1971cd6631f8f76ed2ed13c527a610c398b506d2256fa7')
|
||||
|
||||
Reference in New Issue
Block a user