Update Buildroot to 2019.02.3 (#415)
* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
This commit is contained in:
@@ -18,7 +18,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index 82e830727e..b38bd79121 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1385,6 +1385,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
|
||||
@@ -1393,6 +1393,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
|
||||
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
|
||||
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
|
||||
fi
|
||||
@@ -26,7 +26,7 @@ index 82e830727e..b38bd79121 100644
|
||||
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
||||
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
|
||||
-d $(LIBDEST) -f \
|
||||
@@ -1412,6 +1413,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
|
||||
@@ -1420,6 +1421,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
|
||||
$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
|
||||
-d $(LIBDEST)/site-packages -f \
|
||||
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
||||
|
||||
@@ -13,7 +13,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index a76b5444df..5f87c4db5a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3985,7 +3985,7 @@ fi
|
||||
@@ -4056,7 +4056,7 @@ fi
|
||||
|
||||
AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index b38bd79121..4ce917ab8d 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -196,6 +196,8 @@ FILEMODE= 644
|
||||
@@ -204,6 +204,8 @@ FILEMODE= 644
|
||||
# configure script arguments
|
||||
CONFIG_ARGS= @CONFIG_ARGS@
|
||||
|
||||
@@ -56,7 +56,7 @@ index b38bd79121..4ce917ab8d 100644
|
||||
|
||||
# Subdirectories with code
|
||||
SRCDIRS= @SRCDIRS@
|
||||
@@ -609,6 +611,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
|
||||
@@ -617,6 +619,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
|
||||
esac; \
|
||||
echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
|
||||
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
|
||||
@@ -64,7 +64,7 @@ index b38bd79121..4ce917ab8d 100644
|
||||
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
|
||||
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
|
||||
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
|
||||
@@ -1508,7 +1511,8 @@ libainstall: @DEF_MAKE_RULE@ python-config
|
||||
@@ -1526,7 +1529,8 @@ libainstall: @DEF_MAKE_RULE@ python-config
|
||||
# Install the dynamically loadable modules
|
||||
# This goes into $(exec_prefix)
|
||||
sharedinstall: sharedmods
|
||||
@@ -78,7 +78,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 5f87c4db5a..d5ee2aedfb 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2902,6 +2902,8 @@ LIBS="$withval $LIBS"
|
||||
@@ -2966,6 +2966,8 @@ LIBS="$withval $LIBS"
|
||||
|
||||
PKG_PROG_PKG_CONFIG
|
||||
|
||||
@@ -91,7 +91,7 @@ diff --git a/setup.py b/setup.py
|
||||
index fe477974bd..86643ae8bf 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -43,7 +43,11 @@ host_platform = get_platform()
|
||||
@@ -48,7 +48,11 @@ host_platform = get_platform()
|
||||
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
|
||||
|
||||
# This global variable is used to hold the list of modules to be disabled.
|
||||
|
||||
@@ -24,7 +24,7 @@ diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ex
|
||||
index 74de782d8a..d0c847b365 100644
|
||||
--- a/Lib/distutils/command/build_ext.py
|
||||
+++ b/Lib/distutils/command/build_ext.py
|
||||
@@ -233,7 +233,10 @@ class build_ext(Command):
|
||||
@@ -234,7 +234,10 @@ class build_ext(Command):
|
||||
if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
|
||||
if not sysconfig.python_build:
|
||||
# building third party extensions
|
||||
|
||||
@@ -12,7 +12,7 @@ diff --git a/setup.py b/setup.py
|
||||
index 86643ae8bf..cd00fbdbda 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -850,12 +850,9 @@ class PyBuildExt(build_ext):
|
||||
@@ -855,12 +855,9 @@ class PyBuildExt(build_ext):
|
||||
pass # Issue 7384: Already linked against curses or tinfo.
|
||||
elif curses_library:
|
||||
readline_libs.append(curses_library)
|
||||
|
||||
@@ -20,7 +20,7 @@ diff --git a/setup.py b/setup.py
|
||||
index cd00fbdbda..c956fa08d1 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -547,10 +547,10 @@ class PyBuildExt(build_ext):
|
||||
@@ -552,10 +552,10 @@ class PyBuildExt(build_ext):
|
||||
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')
|
||||
|
||||
@@ -17,7 +17,7 @@ diff --git a/setup.py b/setup.py
|
||||
index c956fa08d1..b3add2be76 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -358,6 +358,7 @@ class PyBuildExt(build_ext):
|
||||
@@ -363,6 +363,7 @@ class PyBuildExt(build_ext):
|
||||
print("Failed to build these modules:")
|
||||
print_three_column(failed)
|
||||
print()
|
||||
|
||||
@@ -23,7 +23,7 @@ diff --git a/setup.py b/setup.py
|
||||
index b3add2be76..29bfd174d2 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -514,7 +514,7 @@ class PyBuildExt(build_ext):
|
||||
@@ -519,7 +519,7 @@ class PyBuildExt(build_ext):
|
||||
tmpfile = os.path.join(self.build_temp, 'gccpaths')
|
||||
if not os.path.exists(self.build_temp):
|
||||
os.makedirs(self.build_temp)
|
||||
|
||||
@@ -19,7 +19,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index 4ce917ab8d..4110fff4ac 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1251,8 +1251,28 @@ maninstall: altmaninstall
|
||||
@@ -1259,8 +1259,28 @@ maninstall: altmaninstall
|
||||
|
||||
# Install the library
|
||||
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
|
||||
@@ -54,7 +54,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index 1ff2362..194dbfc 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1326,26 +1326,24 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1334,26 +1334,24 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
test/test_importlib/source \
|
||||
test/test_importlib/zipdata01 \
|
||||
test/test_importlib/zipdata02 \
|
||||
@@ -99,7 +99,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index d5ee2aedfb..f924937fe1 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3162,6 +3162,11 @@ if test "$posix_threads" = "yes"; then
|
||||
@@ -3226,6 +3226,11 @@ if test "$posix_threads" = "yes"; then
|
||||
AC_CHECK_FUNCS(pthread_getcpuclockid)
|
||||
fi
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index 4110fff4ac..badb2af35d 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1221,7 +1221,9 @@ bininstall: altbininstall
|
||||
@@ -1229,7 +1229,9 @@ bininstall: altbininstall
|
||||
-rm -f $(DESTDIR)$(BINDIR)/idle3
|
||||
(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
|
||||
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
|
||||
@@ -30,7 +30,7 @@ index 4110fff4ac..badb2af35d 100644
|
||||
-rm -f $(DESTDIR)$(BINDIR)/2to3
|
||||
(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
|
||||
-rm -f $(DESTDIR)$(BINDIR)/pyvenv
|
||||
@@ -1269,7 +1271,7 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
@@ -1277,7 +1279,7 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
multiprocessing multiprocessing/dummy \
|
||||
unittest \
|
||||
venv venv/scripts venv/scripts/common venv/scripts/posix \
|
||||
@@ -39,7 +39,7 @@ index 4110fff4ac..badb2af35d 100644
|
||||
|
||||
TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
tkinter/test/test_ttk test \
|
||||
@@ -1344,6 +1346,10 @@ ifeq (@TEST_MODULES@,yes)
|
||||
@@ -1352,6 +1354,10 @@ ifeq (@TEST_MODULES@,yes)
|
||||
LIBSUBDIRS += $(TESTSUBDIRS)
|
||||
endif
|
||||
|
||||
@@ -54,7 +54,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index f924937fe1..1621fa1611 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3162,6 +3162,12 @@ if test "$posix_threads" = "yes"; then
|
||||
@@ -3226,6 +3226,12 @@ if test "$posix_threads" = "yes"; then
|
||||
AC_CHECK_FUNCS(pthread_getcpuclockid)
|
||||
fi
|
||||
|
||||
@@ -71,7 +71,7 @@ diff --git a/setup.py b/setup.py
|
||||
index 29bfd174d2..94dd337fef 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -2332,6 +2332,12 @@ def main():
|
||||
@@ -2337,6 +2337,12 @@ def main():
|
||||
# turn off warnings when deprecated modules are imported
|
||||
import warnings
|
||||
warnings.filterwarnings("ignore",category=DeprecationWarning)
|
||||
@@ -84,7 +84,7 @@ index 29bfd174d2..94dd337fef 100644
|
||||
setup(# PyPI Metadata (PEP 301)
|
||||
name = "Python",
|
||||
version = sys.version.split()[0],
|
||||
@@ -2356,8 +2362,7 @@ def main():
|
||||
@@ -2361,8 +2367,7 @@ def main():
|
||||
# If you change the scripts installed here, you also need to
|
||||
# check the PyBuildScripts command above, and change the links
|
||||
# created by the bininstall target in Makefile.pre.in
|
||||
|
||||
@@ -20,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index badb2af35d..931cc3ed07 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1225,7 +1225,9 @@ ifeq (@PYDOC@,yes)
|
||||
@@ -1233,7 +1233,9 @@ ifeq (@PYDOC@,yes)
|
||||
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
|
||||
endif
|
||||
-rm -f $(DESTDIR)$(BINDIR)/2to3
|
||||
@@ -30,7 +30,7 @@ index badb2af35d..931cc3ed07 100644
|
||||
-rm -f $(DESTDIR)$(BINDIR)/pyvenv
|
||||
(cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
|
||||
if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
|
||||
@@ -1262,7 +1264,6 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
@@ -1270,7 +1272,6 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
html json http dbm xmlrpc \
|
||||
sqlite3 \
|
||||
logging csv wsgiref urllib \
|
||||
@@ -38,7 +38,7 @@ index badb2af35d..931cc3ed07 100644
|
||||
ctypes ctypes/macholib \
|
||||
idlelib idlelib/Icons \
|
||||
distutils distutils/command $(XMLLIBSUBDIRS) \
|
||||
@@ -1332,9 +1333,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1340,9 +1341,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
test/test_email test/test_email/data \
|
||||
test/test_json \
|
||||
sqlite3/test \
|
||||
@@ -48,7 +48,7 @@ index badb2af35d..931cc3ed07 100644
|
||||
ctypes/test \
|
||||
idlelib/idle_test \
|
||||
distutils/tests \
|
||||
@@ -1342,6 +1340,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1350,6 +1348,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
test/test_tools test/test_warnings test/test_warnings/data \
|
||||
unittest/test unittest/test/testmock
|
||||
|
||||
@@ -63,7 +63,7 @@ index badb2af35d..931cc3ed07 100644
|
||||
ifeq (@TEST_MODULES@,yes)
|
||||
LIBSUBDIRS += $(TESTSUBDIRS)
|
||||
endif
|
||||
@@ -1441,10 +1447,12 @@ ifeq (@PYC_BUILD@,yes)
|
||||
@@ -1449,10 +1455,12 @@ ifeq (@PYC_BUILD@,yes)
|
||||
-d $(LIBDEST)/site-packages -f \
|
||||
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
||||
endif
|
||||
@@ -80,7 +80,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 1621fa1611..13b2edf8b7 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3174,6 +3174,12 @@ AC_ARG_ENABLE(test-modules,
|
||||
@@ -3238,6 +3238,12 @@ AC_ARG_ENABLE(test-modules,
|
||||
AS_HELP_STRING([--disable-test-modules], [disable test modules]),
|
||||
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
|
||||
|
||||
@@ -97,7 +97,7 @@ diff --git a/setup.py b/setup.py
|
||||
index 94dd337fef..76429e1326 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -2333,10 +2333,11 @@ def main():
|
||||
@@ -2338,10 +2338,11 @@ def main():
|
||||
import warnings
|
||||
warnings.filterwarnings("ignore",category=DeprecationWarning)
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index 931cc3ed07..a1ce0712cd 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1262,7 +1262,6 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
@@ -1270,7 +1270,6 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
email email/mime \
|
||||
ensurepip ensurepip/_bundled \
|
||||
html json http dbm xmlrpc \
|
||||
@@ -24,7 +24,7 @@ index 931cc3ed07..a1ce0712cd 100644
|
||||
logging csv wsgiref urllib \
|
||||
ctypes ctypes/macholib \
|
||||
idlelib idlelib/Icons \
|
||||
@@ -1332,7 +1331,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1340,7 +1339,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
test/test_asyncio \
|
||||
test/test_email test/test_email/data \
|
||||
test/test_json \
|
||||
@@ -32,7 +32,7 @@ index 931cc3ed07..a1ce0712cd 100644
|
||||
ctypes/test \
|
||||
idlelib/idle_test \
|
||||
distutils/tests \
|
||||
@@ -1348,6 +1346,11 @@ TESTSUBDIRS += lib2to3/tests \
|
||||
@@ -1356,6 +1354,11 @@ TESTSUBDIRS += lib2to3/tests \
|
||||
lib2to3/tests/data/fixers/myfixes
|
||||
endif
|
||||
|
||||
@@ -48,7 +48,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 13b2edf8b7..d7582cfea4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3162,6 +3162,15 @@ if test "$posix_threads" = "yes"; then
|
||||
@@ -3226,6 +3226,15 @@ if test "$posix_threads" = "yes"; then
|
||||
AC_CHECK_FUNCS(pthread_getcpuclockid)
|
||||
fi
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index a1ce0712cd..dc1e917cc3 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1256,7 +1256,7 @@ maninstall: altmaninstall
|
||||
@@ -1264,7 +1264,7 @@ maninstall: altmaninstall
|
||||
# Install the library
|
||||
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
|
||||
|
||||
@@ -25,7 +25,7 @@ index a1ce0712cd..dc1e917cc3 100644
|
||||
asyncio \
|
||||
collections concurrent concurrent/futures encodings \
|
||||
email email/mime \
|
||||
@@ -1273,8 +1273,7 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
@@ -1281,8 +1281,7 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
venv venv/scripts venv/scripts/common venv/scripts/posix \
|
||||
curses
|
||||
|
||||
@@ -35,7 +35,7 @@ index a1ce0712cd..dc1e917cc3 100644
|
||||
test/audiodata \
|
||||
test/capath test/data \
|
||||
test/cjkencodings test/decimaltestdata test/xmltestdata \
|
||||
@@ -1338,6 +1337,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1346,6 +1345,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
test/test_tools test/test_warnings test/test_warnings/data \
|
||||
unittest/test unittest/test/testmock
|
||||
|
||||
@@ -52,7 +52,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index d7582cfea4..6a56a5b0c1 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3171,6 +3171,15 @@ if test "$SQLITE3" = "no" ; then
|
||||
@@ -3235,6 +3235,15 @@ if test "$SQLITE3" = "no" ; then
|
||||
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
|
||||
fi
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index dc1e917cc3..6a6bc082cd 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1270,8 +1270,7 @@ LIBSUBDIRS= site-packages \
|
||||
@@ -1278,8 +1278,7 @@ LIBSUBDIRS= site-packages \
|
||||
turtledemo \
|
||||
multiprocessing multiprocessing/dummy \
|
||||
unittest \
|
||||
@@ -26,7 +26,7 @@ index dc1e917cc3..6a6bc082cd 100644
|
||||
|
||||
TESTSUBDIRS= test \
|
||||
test/audiodata \
|
||||
@@ -1343,6 +1342,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1351,6 +1350,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
|
||||
tkinter/test/test_ttk
|
||||
endif
|
||||
|
||||
@@ -41,7 +41,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 6a56a5b0c1..5896b39ff9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3180,6 +3180,15 @@ if test "$TK" = "no"; then
|
||||
@@ -3244,6 +3244,15 @@ if test "$TK" = "no"; then
|
||||
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
|
||||
fi
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index 6a6bc082cd..dc4b92b6fe 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1265,7 +1265,7 @@ LIBSUBDIRS= site-packages \
|
||||
@@ -1273,7 +1273,7 @@ LIBSUBDIRS= site-packages \
|
||||
logging csv wsgiref urllib \
|
||||
ctypes ctypes/macholib \
|
||||
idlelib idlelib/Icons \
|
||||
@@ -32,7 +32,7 @@ index 6a6bc082cd..dc4b92b6fe 100644
|
||||
importlib \
|
||||
turtledemo \
|
||||
multiprocessing multiprocessing/dummy \
|
||||
@@ -1346,6 +1346,10 @@ ifeq (@CURSES@,yes)
|
||||
@@ -1354,6 +1354,10 @@ ifeq (@CURSES@,yes)
|
||||
LIBSUBDIRS += curses
|
||||
endif
|
||||
|
||||
@@ -47,7 +47,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 5896b39ff9..6f21482207 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2905,13 +2905,21 @@ PKG_PROG_PKG_CONFIG
|
||||
@@ -2969,13 +2969,21 @@ PKG_PROG_PKG_CONFIG
|
||||
AC_SUBST(DISABLED_EXTENSIONS)
|
||||
|
||||
# Check for use of the system expat library
|
||||
@@ -78,7 +78,7 @@ diff --git a/setup.py b/setup.py
|
||||
index 76429e1326..38aa5e605e 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1485,7 +1485,7 @@ class PyBuildExt(build_ext):
|
||||
@@ -1490,7 +1490,7 @@ class PyBuildExt(build_ext):
|
||||
#
|
||||
# More information on Expat can be found at www.libexpat.org.
|
||||
#
|
||||
|
||||
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 6f21482207..c7742faf41 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3179,6 +3179,12 @@ if test "$SQLITE3" = "no" ; then
|
||||
@@ -3243,6 +3243,12 @@ if test "$SQLITE3" = "no" ; then
|
||||
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
|
||||
fi
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index c7742faf41..42a871bb09 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3185,6 +3185,12 @@ AC_ARG_ENABLE(codecs-cjk,
|
||||
@@ -3249,6 +3249,12 @@ AC_ARG_ENABLE(codecs-cjk,
|
||||
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
|
||||
fi])
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 42a871bb09..1d610e132b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3191,6 +3191,12 @@ AC_ARG_ENABLE(nis,
|
||||
@@ -3255,6 +3255,12 @@ AC_ARG_ENABLE(nis,
|
||||
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
|
||||
fi])
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index dc4b92b6fe..3e43066d90 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1219,7 +1219,9 @@ bininstall: altbininstall
|
||||
@@ -1227,7 +1227,9 @@ bininstall: altbininstall
|
||||
-rm -f $(DESTDIR)$(LIBPC)/python3.pc
|
||||
(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc)
|
||||
-rm -f $(DESTDIR)$(BINDIR)/idle3
|
||||
@@ -29,7 +29,7 @@ index dc4b92b6fe..3e43066d90 100644
|
||||
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
|
||||
ifeq (@PYDOC@,yes)
|
||||
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
|
||||
@@ -1264,7 +1266,6 @@ LIBSUBDIRS= site-packages \
|
||||
@@ -1272,7 +1274,6 @@ LIBSUBDIRS= site-packages \
|
||||
html json http dbm xmlrpc \
|
||||
logging csv wsgiref urllib \
|
||||
ctypes ctypes/macholib \
|
||||
@@ -37,7 +37,7 @@ index dc4b92b6fe..3e43066d90 100644
|
||||
distutils distutils/command \
|
||||
importlib \
|
||||
turtledemo \
|
||||
@@ -1350,6 +1351,10 @@ ifeq (@EXPAT@,yes)
|
||||
@@ -1358,6 +1359,10 @@ ifeq (@EXPAT@,yes)
|
||||
LIBSUBDIRS += $(XMLLIBSUBDIRS)
|
||||
endif
|
||||
|
||||
@@ -52,7 +52,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 1d610e132b..2699e7ceb1 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3233,6 +3233,12 @@ AC_ARG_ENABLE(lib2to3,
|
||||
@@ -3297,6 +3297,12 @@ AC_ARG_ENABLE(lib2to3,
|
||||
AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
|
||||
[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
|
||||
|
||||
@@ -69,7 +69,7 @@ diff --git a/setup.py b/setup.py
|
||||
index 38aa5e605e..d642825c1e 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -2333,11 +2333,13 @@ def main():
|
||||
@@ -2338,11 +2338,13 @@ def main():
|
||||
import warnings
|
||||
warnings.filterwarnings("ignore",category=DeprecationWarning)
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 2699e7ceb1..e2c3b6f25c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2956,13 +2956,20 @@ fi
|
||||
@@ -3020,13 +3020,20 @@ fi
|
||||
AC_SUBST(LIBFFI_INCLUDEDIR)
|
||||
|
||||
# Check for use of the system libmpdec library
|
||||
@@ -50,7 +50,7 @@ diff --git a/setup.py b/setup.py
|
||||
index d642825c1e..5b98255857 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -2010,7 +2010,7 @@ class PyBuildExt(build_ext):
|
||||
@@ -2015,7 +2015,7 @@ class PyBuildExt(build_ext):
|
||||
def _decimal_ext(self):
|
||||
extra_compile_args = []
|
||||
undef_macros = []
|
||||
|
||||
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index e2c3b6f25c..8e3dded25e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2971,6 +2971,12 @@ else
|
||||
@@ -3035,6 +3035,12 @@ else
|
||||
fi
|
||||
AC_SUBST(MPDEC)
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 8e3dded25e..28bcdabd67 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3210,6 +3210,12 @@ AC_ARG_ENABLE(unicodedata,
|
||||
@@ -3274,6 +3274,12 @@ AC_ARG_ENABLE(unicodedata,
|
||||
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
|
||||
fi])
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 28bcdabd67..484f6ebaca 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3216,6 +3216,12 @@ AC_ARG_ENABLE(openssl,
|
||||
@@ -3280,6 +3280,12 @@ AC_ARG_ENABLE(openssl,
|
||||
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib"
|
||||
fi])
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 484f6ebaca..79538df0cf 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3222,6 +3222,24 @@ AC_ARG_ENABLE(readline,
|
||||
@@ -3286,6 +3286,24 @@ AC_ARG_ENABLE(readline,
|
||||
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline"
|
||||
fi])
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ diff --git a/setup.py b/setup.py
|
||||
index 1a7085c5c4..f33d0b57b8 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1627,7 +1627,8 @@ class PyBuildExt(build_ext):
|
||||
@@ -1632,7 +1632,8 @@ class PyBuildExt(build_ext):
|
||||
missing.append('_tkinter')
|
||||
|
||||
# Build the _uuid module if possible
|
||||
|
||||
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index b022460e73..505b7c9be0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3258,6 +3258,15 @@ if test "$CURSES" = "no"; then
|
||||
@@ -3322,6 +3322,15 @@ if test "$CURSES" = "no"; then
|
||||
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
|
||||
fi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://www.python.org/downloads/release/python-371/
|
||||
md5 0a57e9022c07fad3dadb2eef58568edb Python-3.7.1.tar.xz
|
||||
# From https://www.python.org/downloads/release/python-373/
|
||||
md5 93df27aec0cd18d6d42173e601ffbbfd Python-3.7.3.tar.xz
|
||||
# Locally computed
|
||||
sha256 fa7e2b8e8c9402f192ad56dc4f814089d1c4466c97d780f5e5acc02c04243d6d Python-3.7.1.tar.xz
|
||||
sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 LICENSE
|
||||
sha256 da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318 Python-3.7.3.tar.xz
|
||||
sha256 a77d71d6be6f9032e6b6e5d2cf6da68f9eeab9036edfbc043633c8979cd5e82c LICENSE
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
PYTHON3_VERSION_MAJOR = 3.7
|
||||
PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1
|
||||
PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).3
|
||||
PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
|
||||
PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION)
|
||||
PYTHON3_LICENSE = Python-2.0, others
|
||||
|
||||
Reference in New Issue
Block a user