Bump Buildroot Version to buildroot 2019_02_6
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
|
||||
@@ -1393,6 +1393,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
|
||||
@@ -1395,6 +1395,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 \
|
||||
@@ -1420,6 +1421,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
|
||||
@@ -1422,6 +1423,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
|
||||
|
||||
@@ -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
|
||||
@@ -204,6 +204,8 @@ FILEMODE= 644
|
||||
@@ -206,6 +206,8 @@ FILEMODE= 644
|
||||
# configure script arguments
|
||||
CONFIG_ARGS= @CONFIG_ARGS@
|
||||
|
||||
@@ -56,7 +56,7 @@ index b38bd79121..4ce917ab8d 100644
|
||||
|
||||
# Subdirectories with code
|
||||
SRCDIRS= @SRCDIRS@
|
||||
@@ -617,6 +619,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
|
||||
@@ -619,6 +621,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)' \
|
||||
@@ -1526,7 +1529,8 @@ libainstall: @DEF_MAKE_RULE@ python-config
|
||||
@@ -1528,7 +1531,8 @@ libainstall: @DEF_MAKE_RULE@ python-config
|
||||
# Install the dynamically loadable modules
|
||||
# This goes into $(exec_prefix)
|
||||
sharedinstall: sharedmods
|
||||
|
||||
@@ -12,7 +12,7 @@ diff --git a/setup.py b/setup.py
|
||||
index 86643ae8bf..cd00fbdbda 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -855,12 +855,9 @@ class PyBuildExt(build_ext):
|
||||
@@ -894,12 +894,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
|
||||
@@ -552,10 +552,10 @@ class PyBuildExt(build_ext):
|
||||
@@ -591,10 +591,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
|
||||
@@ -363,6 +363,7 @@ class PyBuildExt(build_ext):
|
||||
@@ -402,6 +402,7 @@ class PyBuildExt(build_ext):
|
||||
print("Failed to build these modules:")
|
||||
print_three_column(failed)
|
||||
print()
|
||||
|
||||
@@ -53,7 +53,7 @@ index d1d3275..9e259c0 100644
|
||||
VERSION="@VERSION@"
|
||||
LIBM="@LIBM@"
|
||||
LIBC="@LIBC@"
|
||||
@@ -49,7 +50,7 @@ OPT="@OPT@"
|
||||
@@ -48,7 +49,7 @@ OPT="@OPT@"
|
||||
PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
|
||||
LDVERSION="@LDVERSION@"
|
||||
LIBDEST=${prefix_real}/lib/python${VERSION}
|
||||
|
||||
@@ -23,7 +23,7 @@ diff --git a/setup.py b/setup.py
|
||||
index b3add2be76..29bfd174d2 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -519,7 +519,7 @@ class PyBuildExt(build_ext):
|
||||
@@ -558,7 +558,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
|
||||
@@ -1259,8 +1259,28 @@ maninstall: altmaninstall
|
||||
@@ -1261,8 +1261,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
|
||||
@@ -1334,26 +1334,24 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1336,26 +1336,24 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
test/test_importlib/source \
|
||||
test/test_importlib/zipdata01 \
|
||||
test/test_importlib/zipdata02 \
|
||||
|
||||
@@ -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
|
||||
@@ -1229,7 +1229,9 @@ bininstall: altbininstall
|
||||
@@ -1231,7 +1231,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
|
||||
@@ -1277,7 +1279,7 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
@@ -1279,7 +1281,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 \
|
||||
@@ -1352,6 +1354,10 @@ ifeq (@TEST_MODULES@,yes)
|
||||
@@ -1354,6 +1356,10 @@ ifeq (@TEST_MODULES@,yes)
|
||||
LIBSUBDIRS += $(TESTSUBDIRS)
|
||||
endif
|
||||
|
||||
@@ -71,7 +71,7 @@ diff --git a/setup.py b/setup.py
|
||||
index 29bfd174d2..94dd337fef 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -2337,6 +2337,12 @@ def main():
|
||||
@@ -2376,6 +2376,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],
|
||||
@@ -2361,8 +2367,7 @@ def main():
|
||||
@@ -2400,8 +2406,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
|
||||
@@ -1233,7 +1233,9 @@ ifeq (@PYDOC@,yes)
|
||||
@@ -1235,7 +1235,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 \
|
||||
@@ -1270,7 +1272,6 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
@@ -1272,7 +1274,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) \
|
||||
@@ -1340,9 +1341,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1342,9 +1343,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 \
|
||||
@@ -1350,6 +1348,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1352,6 +1350,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
|
||||
@@ -1449,10 +1455,12 @@ ifeq (@PYC_BUILD@,yes)
|
||||
@@ -1451,10 +1457,12 @@ ifeq (@PYC_BUILD@,yes)
|
||||
-d $(LIBDEST)/site-packages -f \
|
||||
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
||||
endif
|
||||
@@ -97,7 +97,7 @@ diff --git a/setup.py b/setup.py
|
||||
index 94dd337fef..76429e1326 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -2338,10 +2338,11 @@ def main():
|
||||
@@ -2377,10 +2377,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
|
||||
@@ -1270,7 +1270,6 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
@@ -1272,7 +1272,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 \
|
||||
@@ -1340,7 +1339,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1342,7 +1341,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 \
|
||||
@@ -1356,6 +1354,11 @@ TESTSUBDIRS += lib2to3/tests \
|
||||
@@ -1358,6 +1356,11 @@ TESTSUBDIRS += lib2to3/tests \
|
||||
lib2to3/tests/data/fixers/myfixes
|
||||
endif
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -1264,7 +1264,7 @@ maninstall: altmaninstall
|
||||
@@ -1266,7 +1266,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 \
|
||||
@@ -1281,8 +1281,7 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
@@ -1283,8 +1283,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 \
|
||||
@@ -1346,6 +1345,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1348,6 +1347,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
test/test_tools test/test_warnings test/test_warnings/data \
|
||||
unittest/test unittest/test/testmock
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -1278,8 +1278,7 @@ LIBSUBDIRS= site-packages \
|
||||
@@ -1280,8 +1280,7 @@ LIBSUBDIRS= site-packages \
|
||||
turtledemo \
|
||||
multiprocessing multiprocessing/dummy \
|
||||
unittest \
|
||||
@@ -26,7 +26,7 @@ index dc1e917cc3..6a6bc082cd 100644
|
||||
|
||||
TESTSUBDIRS= test \
|
||||
test/audiodata \
|
||||
@@ -1351,6 +1350,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1353,6 +1352,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
|
||||
tkinter/test/test_ttk
|
||||
endif
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -1273,7 +1273,7 @@ LIBSUBDIRS= site-packages \
|
||||
@@ -1275,7 +1275,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 \
|
||||
@@ -1354,6 +1354,10 @@ ifeq (@CURSES@,yes)
|
||||
@@ -1356,6 +1356,10 @@ ifeq (@CURSES@,yes)
|
||||
LIBSUBDIRS += curses
|
||||
endif
|
||||
|
||||
@@ -78,7 +78,7 @@ diff --git a/setup.py b/setup.py
|
||||
index 76429e1326..38aa5e605e 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1490,7 +1490,7 @@ class PyBuildExt(build_ext):
|
||||
@@ -1529,7 +1529,7 @@ class PyBuildExt(build_ext):
|
||||
#
|
||||
# More information on Expat can be found at www.libexpat.org.
|
||||
#
|
||||
|
||||
@@ -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
|
||||
@@ -1227,7 +1227,9 @@ bininstall: altbininstall
|
||||
@@ -1229,7 +1229,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)
|
||||
@@ -1272,7 +1274,6 @@ LIBSUBDIRS= site-packages \
|
||||
@@ -1274,7 +1276,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 \
|
||||
@@ -1358,6 +1359,10 @@ ifeq (@EXPAT@,yes)
|
||||
@@ -1360,6 +1361,10 @@ ifeq (@EXPAT@,yes)
|
||||
LIBSUBDIRS += $(XMLLIBSUBDIRS)
|
||||
endif
|
||||
|
||||
@@ -69,7 +69,7 @@ diff --git a/setup.py b/setup.py
|
||||
index 38aa5e605e..d642825c1e 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -2338,11 +2338,13 @@ def main():
|
||||
@@ -2377,11 +2377,13 @@ def main():
|
||||
import warnings
|
||||
warnings.filterwarnings("ignore",category=DeprecationWarning)
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ diff --git a/setup.py b/setup.py
|
||||
index d642825c1e..5b98255857 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -2015,7 +2015,7 @@ class PyBuildExt(build_ext):
|
||||
@@ -2054,7 +2054,7 @@ class PyBuildExt(build_ext):
|
||||
def _decimal_ext(self):
|
||||
extra_compile_args = []
|
||||
undef_macros = []
|
||||
|
||||
@@ -39,7 +39,7 @@ index 9e259c0..8b249d9 100644
|
||||
exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#")
|
||||
exec_prefix_real=${prefix_real}
|
||||
includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#")
|
||||
@@ -49,7 +49,7 @@ LINKFORSHARED="@LINKFORSHARED@"
|
||||
@@ -48,7 +48,7 @@ LINKFORSHARED="@LINKFORSHARED@"
|
||||
OPT="@OPT@"
|
||||
PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
|
||||
LDVERSION="@LDVERSION@"
|
||||
|
||||
@@ -23,7 +23,7 @@ diff --git a/setup.py b/setup.py
|
||||
index 1a7085c5c4..f33d0b57b8 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1632,7 +1632,8 @@ class PyBuildExt(build_ext):
|
||||
@@ -1671,7 +1671,8 @@ class PyBuildExt(build_ext):
|
||||
missing.append('_tkinter')
|
||||
|
||||
# Build the _uuid module if possible
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
From e1a2c27bcb9091f851ef7a9c7d59822a125a0b8e Mon Sep 17 00:00:00 2001
|
||||
From: Peter Korsgaard <peter@korsgaard.com>
|
||||
Date: Fri, 2 Aug 2019 15:53:16 +0200
|
||||
Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for
|
||||
musl/uclibc GCC 8+ toolchains
|
||||
|
||||
GCC commit 6834b83784dcf0364eb820e8 (multiarch support for non-glibc linux
|
||||
systems), which is part of GCC 8+, changed the multiarch logic to use
|
||||
$arch-linux-musl / $arch-linux-uclibc rather than $arch-linux-gnu.
|
||||
|
||||
This then causes the python3 configure script to error out:
|
||||
|
||||
checking for the platform triplet based on compiler characteristics... powerpc-linux-gnu
|
||||
configure: error: internal configure error for the platform triplet, please file a bug report
|
||||
|
||||
http://autobuild.buildroot.net/results/cb4/cb49c539501342e45cbe5ade82e588fcdf51f05b
|
||||
|
||||
As it requires that the --print-multiarch output (if not empty) matches the
|
||||
deduced triplet (which always uses -linux-gnu).
|
||||
|
||||
It isn't quite clear why --print-multiarch returns something for a
|
||||
non-multiarch toolchain on some architectures (E.G. PowerPC), but as a
|
||||
workaround, rewrite the --print-multiarch output to match older GCC versions
|
||||
to keep the configure script happy.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
configure.ac | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e5fb7e7b0b..9c64f960d6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -724,7 +724,9 @@ then
|
||||
fi
|
||||
|
||||
|
||||
-MULTIARCH=$($CC --print-multiarch 2>/dev/null)
|
||||
+# GCC 8+ returns $arch-linux-{musl,uclibc} for musl/uClibc based
|
||||
+# toolchains confusing python. Fix that up
|
||||
+MULTIARCH=$($CC --print-multiarch 2>/dev/null | sed -E 's/-linux-(musl|uclibc)*$/-linux-gnu/')
|
||||
AC_SUBST(MULTIARCH)
|
||||
|
||||
AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://www.python.org/downloads/release/python-373/
|
||||
md5 93df27aec0cd18d6d42173e601ffbbfd Python-3.7.3.tar.xz
|
||||
# From https://www.python.org/downloads/release/python-374/
|
||||
md5 d33e4aae66097051c2eca45ee3604803 Python-3.7.4.tar.xz
|
||||
# Locally computed
|
||||
sha256 da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318 Python-3.7.3.tar.xz
|
||||
sha256 fb799134b868199930b75f26678f18932214042639cd52b16da7fd134cd9b13f Python-3.7.4.tar.xz
|
||||
sha256 a77d71d6be6f9032e6b6e5d2cf6da68f9eeab9036edfbc043633c8979cd5e82c LICENSE
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
PYTHON3_VERSION_MAJOR = 3.7
|
||||
PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).3
|
||||
PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).4
|
||||
PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
|
||||
PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION)
|
||||
PYTHON3_LICENSE = Python-2.0, others
|
||||
@@ -70,10 +70,6 @@ else
|
||||
PYTHON3_CONF_OPTS += --with-expat=none
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY),y)
|
||||
PYTHON3_CONF_OPTS += --enable-old-stdlib-cache
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PYTHON3_SQLITE),y)
|
||||
PYTHON3_DEPENDENCIES += sqlite
|
||||
else
|
||||
@@ -207,8 +203,8 @@ define PYTHON3_REMOVE_USELESS_FILES
|
||||
rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config
|
||||
rm -f $(TARGET_DIR)/usr/bin/python3-config
|
||||
rm -f $(TARGET_DIR)/usr/bin/smtpd.py.3
|
||||
for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)m/ \
|
||||
-type f -not -name pyconfig.h -a -not -name Makefile` ; do \
|
||||
for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)m-*/ \
|
||||
-type f -not -name Makefile` ; do \
|
||||
rm -f $$i ; \
|
||||
done
|
||||
rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/__pycache__/
|
||||
|
||||
Reference in New Issue
Block a user