jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "python3: bump to 2.6.4"

Browse Source 
This reverts commit 233202597d9411399aeaded2f9a7cd14f2e29833, which
causes a lot of build failures. Part of the Python build process tries
to use os.replace(), which is only available since Python 3.3. It
should work if the host-python being built was used, but unfortunately
the system Python ends up being used, causing the build failure.

Fixes:

  http://autobuild.buildroot.net/results/ed95a7ded6bd6c17bd0820b3a96862487b71eb2b/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2018-02-05 07:08:42 +01:00
parent 9385bc0520
commit e2c03d54bb
19 changed files with 68 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
View File

@ -9,8 +9,6 @@ the compilation of pyc.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[ Andrey Smrinov: ported to Python 3.6 ] [ Andrey Smrinov: ported to Python 3.6 ]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
Makefile.pre.in | 2 ++ Makefile.pre.in | 2 ++
configure.ac | 6 ++++++ configure.ac | 6 ++++++
@ -20,7 +18,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index 82e830727e..b38bd79121 100644 index 82e830727e..b38bd79121 100644
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -1345,6 +1345,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c @@ -1311,6 +1311,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi fi
@ -28,7 +26,7 @@ index 82e830727e..b38bd79121 100644
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST) -f \ -d $(LIBDEST) -f \
@@ -1372,6 +1373,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c @@ -1338,6 +1339,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST)/site-packages -f \ -d $(LIBDEST)/site-packages -f \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages

6
package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
View File

@ -37,8 +37,6 @@ then extended by Thomas Petazzoni
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[ Andrey Smirnov: ported to Python 3.6 ] [ Andrey Smirnov: ported to Python 3.6 ]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
Makefile.pre.in | 6 +++++- Makefile.pre.in | 6 +++++-
configure.ac | 2 ++ configure.ac | 2 ++
@ -58,7 +56,7 @@ index b38bd79121..4ce917ab8d 100644
# Subdirectories with code # Subdirectories with code
SRCDIRS= @SRCDIRS@ SRCDIRS= @SRCDIRS@
@@ -586,6 +588,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o @@ -575,6 +577,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
esac; \ esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@ -66,7 +64,7 @@ index b38bd79121..4ce917ab8d 100644
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
@@ -1470,7 +1473,8 @@ libainstall: @DEF_MAKE_RULE@ python-config @@ -1436,7 +1439,8 @@ libainstall: @DEF_MAKE_RULE@ python-config
# Install the dynamically loadable modules # Install the dynamically loadable modules
# This goes into $(exec_prefix) # This goes into $(exec_prefix)
sharedinstall: sharedmods sharedinstall: sharedmods

4
package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
View File

@ -4,8 +4,6 @@ Date: Wed, 23 Dec 2015 11:36:00 +0100
Subject: [PATCH] Don't look in /usr/lib/termcap for libraries Subject: [PATCH] Don't look in /usr/lib/termcap for libraries
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
setup.py | 5 +---- setup.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-) 1 file changed, 1 insertion(+), 4 deletions(-)
@ -14,7 +12,7 @@ diff --git a/setup.py b/setup.py
index 86643ae8bf..cd00fbdbda 100644 index 86643ae8bf..cd00fbdbda 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -816,12 +816,9 @@ class PyBuildExt(build_ext): @@ -786,12 +786,9 @@ class PyBuildExt(build_ext):
pass # Issue 7384: Already linked against curses or tinfo. pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library: elif curses_library:
readline_libs.append(curses_library) readline_libs.append(curses_library)

4
package/python3/0006-Don-t-add-multiarch-paths.patch
View File

@ -12,8 +12,6 @@ cross-compiling.
Investigation done by David <buildroot-2014@inbox.com>. Investigation done by David <buildroot-2014@inbox.com>.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
setup.py | 2 +- setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
@ -22,7 +20,7 @@ diff --git a/setup.py b/setup.py
index cd00fbdbda..c956fa08d1 100644 index cd00fbdbda..c956fa08d1 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -522,10 +522,10 @@ class PyBuildExt(build_ext): @@ -497,10 +497,10 @@ class PyBuildExt(build_ext):
if not cross_compiling: if not cross_compiling:
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')

4
package/python3/0007-Abort-on-failed-module-build.patch
View File

@ -9,8 +9,6 @@ nice behavior, so this patch changes setup.py to abort with an error,
so that the build issue is clearly noticeable. so that the build issue is clearly noticeable.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
setup.py | 1 + setup.py | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
@ -19,7 +17,7 @@ diff --git a/setup.py b/setup.py
index c956fa08d1..b3add2be76 100644 index c956fa08d1..b3add2be76 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -337,6 +337,7 @@ class PyBuildExt(build_ext): @@ -312,6 +312,7 @@ class PyBuildExt(build_ext):
print("Failed to build these modules:") print("Failed to build these modules:")
print_three_column(failed) print_three_column(failed)
print() print()

39
package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch
View File

@ -20,50 +20,41 @@ ensuring we only match the beginning of the string.
Submitted upstream: http://bugs.python.org/issue22907 Submitted upstream: http://bugs.python.org/issue22907
Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
Misc/python-config.sh.in | 13 +++++++------ Misc/python-config.sh.in | 12 ++++++------
1 file changed, 7 insertions(+), 6 deletions(-) 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
index d1d3275..9e259c0 100644 index 30c6927871..f905a7132f 100644
--- a/Misc/python-config.sh.in --- a/Misc/python-config.sh.in
+++ b/Misc/python-config.sh.in +++ b/Misc/python-config.sh.in
@@ -24,18 +24,19 @@ installed_prefix () @@ -29,12 +29,12 @@ prefix_real=$(installed_prefix "$0")
echo $RESULT
}
+prefix_build="@prefix@"
prefix_real=$(installed_prefix "$0")
# Use sed to fix paths from their built-to locations to their installed-to # Use sed to fix paths from their built-to locations to their installed-to
# locations. Keep prefix & exec_prefix using their original values in case # locations.
# they are referenced in other configure variables, to prevent double -prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#")
# substitution, issue #22140.
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
+prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#") +prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#")
exec_prefix_build="@exec_prefix@"
-exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#")
-includedir=$(echo "@includedir@" | sed "s#$prefix_build#$prefix_real#")
-libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#")
-CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#")
+exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#") +exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#")
exec_prefix_real=${prefix_real}
-includedir=$(echo "@includedir@" | sed "s#$prefix#$prefix_real#")
-libdir=$(echo "@libdir@" | sed "s#$prefix#$prefix_real#")
-CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix#$prefix_real#")
+includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#") +includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#")
+libdir=$(echo "@libdir@" | sed "s#^$prefix_build#$prefix_real#") +libdir=$(echo "@libdir@" | sed "s#^$prefix_build#$prefix_real#")
+CFLAGS=$(echo "@CFLAGS@" | sed "s#^$prefix_build#$prefix_real#") +CFLAGS=$(echo "@CFLAGS@" | sed "s#^$prefix_build#$prefix_real#")
VERSION="@VERSION@" VERSION="@VERSION@"
LIBM="@LIBM@" LIBM="@LIBM@"
LIBC="@LIBC@" LIBC="@LIBC@"
@@ -49,7 +50,7 @@ OPT="@OPT@" @@ -48,7 +48,7 @@ OPT="@OPT@"
PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
LDVERSION="@LDVERSION@" LDVERSION="@LDVERSION@"
LIBDEST=${prefix_real}/lib/python${VERSION} LIBDEST=${prefix}/lib/python${VERSION}
-LIBPL=$(echo "@LIBPL@" | sed "s#$prefix#$prefix_real#") -LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
+LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#") +LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#")
SO="@EXT_SUFFIX@" SO="@EXT_SUFFIX@"
PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}"
-- --
2.14.3 2.13.5

4
package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
View File

@ -15,8 +15,6 @@ any system library (eg. libz, libssl, etc.)
Signed-off-by: Samuel Cabrero <samuelcabrero@gmail.com> Signed-off-by: Samuel Cabrero <samuelcabrero@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
setup.py | 2 +- setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
@ -25,7 +23,7 @@ diff --git a/setup.py b/setup.py
index b3add2be76..29bfd174d2 100644 index b3add2be76..29bfd174d2 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -482,7 +482,7 @@ class PyBuildExt(build_ext): @@ -457,7 +457,7 @@ class PyBuildExt(build_ext):
tmpfile = os.path.join(self.build_temp, 'gccpaths') tmpfile = os.path.join(self.build_temp, 'gccpaths')
if not os.path.exists(self.build_temp): if not os.path.exists(self.build_temp):
os.makedirs(self.build_temp) os.makedirs(self.build_temp)

6
package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
View File

@ -10,8 +10,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[ Andrey Smirnov: ported to Python 3.6 ] [ Andrey Smirnov: ported to Python 3.6 ]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
Makefile.pre.in | 55 ++++++++++++++++++++++++++++++++++++------------------- Makefile.pre.in | 55 ++++++++++++++++++++++++++++++++++++-------------------
configure.ac | 5 +++++ configure.ac | 5 +++++
@ -21,7 +19,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index 4ce917ab8d..4110fff4ac 100644 index 4ce917ab8d..4110fff4ac 100644
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -1226,8 +1226,28 @@ maninstall: altmaninstall @@ -1194,8 +1194,28 @@ maninstall: altmaninstall
# Install the library # Install the library
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
@ -52,7 +50,7 @@ index 4ce917ab8d..4110fff4ac 100644
test/audiodata \ test/audiodata \
test/capath test/data \ test/capath test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata \ test/cjkencodings test/decimaltestdata test/xmltestdata \
@@ -1263,29 +1283,26 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ @@ -1229,29 +1249,26 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \
test/test_importlib/namespace_pkgs/project3/parent/child \ test/test_importlib/namespace_pkgs/project3/parent/child \
test/test_importlib/namespace_pkgs/module_and_namespace_package \ test/test_importlib/namespace_pkgs/module_and_namespace_package \
test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \ test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \

12
package/python3/0014-Add-an-option-to-disable-pydoc.patch
View File

@ -10,8 +10,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[ Andrey Smirnov: ported to Python 3.6 ] [ Andrey Smirnov: ported to Python 3.6 ]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
Makefile.pre.in | 8 +++++++- Makefile.pre.in | 8 +++++++-
configure.ac | 6 ++++++ configure.ac | 6 ++++++
@ -22,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index 4110fff4ac..badb2af35d 100644 index 4110fff4ac..badb2af35d 100644
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -1196,7 +1196,9 @@ bininstall: altbininstall @@ -1164,7 +1164,9 @@ bininstall: altbininstall
-rm -f $(DESTDIR)$(BINDIR)/idle3 -rm -f $(DESTDIR)$(BINDIR)/idle3
(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
-rm -f $(DESTDIR)$(BINDIR)/pydoc3 -rm -f $(DESTDIR)$(BINDIR)/pydoc3
@ -32,7 +30,7 @@ index 4110fff4ac..badb2af35d 100644
-rm -f $(DESTDIR)$(BINDIR)/2to3 -rm -f $(DESTDIR)$(BINDIR)/2to3
(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
-rm -f $(DESTDIR)$(BINDIR)/pyvenv -rm -f $(DESTDIR)$(BINDIR)/pyvenv
@@ -1244,7 +1246,7 @@ LIBSUBDIRS= tkinter site-packages \ @@ -1212,7 +1214,7 @@ LIBSUBDIRS= tkinter site-packages \
multiprocessing multiprocessing/dummy \ multiprocessing multiprocessing/dummy \
unittest \ unittest \
venv venv/scripts venv/scripts/common venv/scripts/posix \ venv venv/scripts venv/scripts/common venv/scripts/posix \
@ -41,7 +39,7 @@ index 4110fff4ac..badb2af35d 100644
TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
tkinter/test/test_ttk test \ tkinter/test/test_ttk test \
@@ -1303,6 +1305,10 @@ ifeq (@TEST_MODULES@,yes) @@ -1269,6 +1271,10 @@ ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += $(TESTSUBDIRS) LIBSUBDIRS += $(TESTSUBDIRS)
endif endif
@ -73,7 +71,7 @@ diff --git a/setup.py b/setup.py
index 29bfd174d2..94dd337fef 100644 index 29bfd174d2..94dd337fef 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -2323,6 +2323,12 @@ def main(): @@ -2281,6 +2281,12 @@ def main():
# turn off warnings when deprecated modules are imported # turn off warnings when deprecated modules are imported
import warnings import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning) warnings.filterwarnings("ignore",category=DeprecationWarning)
@ -86,7 +84,7 @@ index 29bfd174d2..94dd337fef 100644
setup(# PyPI Metadata (PEP 301) setup(# PyPI Metadata (PEP 301)
name = "Python", name = "Python",
version = sys.version.split()[0], version = sys.version.split()[0],
@@ -2347,8 +2353,7 @@ def main(): @@ -2305,8 +2311,7 @@ def main():
# If you change the scripts installed here, you also need to # If you change the scripts installed here, you also need to
# check the PyBuildScripts command above, and change the links # check the PyBuildScripts command above, and change the links
# created by the bininstall target in Makefile.pre.in # created by the bininstall target in Makefile.pre.in

14
package/python3/0015-Add-an-option-to-disable-lib2to3.patch
View File

@ -10,8 +10,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[ Andrey Smirnov: ported to Python 3.6 ] [ Andrey Smirnov: ported to Python 3.6 ]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
Makefile.pre.in | 16 ++++++++++++---- Makefile.pre.in | 16 ++++++++++++----
configure.ac | 6 ++++++ configure.ac | 6 ++++++
@ -22,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index badb2af35d..931cc3ed07 100644 index badb2af35d..931cc3ed07 100644
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -1200,7 +1200,9 @@ ifeq (@PYDOC@,yes) @@ -1168,7 +1168,9 @@ ifeq (@PYDOC@,yes)
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
endif endif
-rm -f $(DESTDIR)$(BINDIR)/2to3 -rm -f $(DESTDIR)$(BINDIR)/2to3
@ -32,7 +30,7 @@ index badb2af35d..931cc3ed07 100644
-rm -f $(DESTDIR)$(BINDIR)/pyvenv -rm -f $(DESTDIR)$(BINDIR)/pyvenv
(cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv) (cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
@@ -1237,7 +1239,6 @@ LIBSUBDIRS= tkinter site-packages \ @@ -1205,7 +1207,6 @@ LIBSUBDIRS= tkinter site-packages \
html json http dbm xmlrpc \ html json http dbm xmlrpc \
sqlite3 \ sqlite3 \
logging csv wsgiref urllib \ logging csv wsgiref urllib \
@ -40,7 +38,7 @@ index badb2af35d..931cc3ed07 100644
ctypes ctypes/macholib \ ctypes ctypes/macholib \
idlelib idlelib/Icons \ idlelib idlelib/Icons \
distutils distutils/command $(XMLLIBSUBDIRS) \ distutils distutils/command $(XMLLIBSUBDIRS) \
@@ -1289,9 +1290,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ @@ -1255,9 +1256,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
test/test_email test/test_email/data \ test/test_email test/test_email/data \
test/test_json \ test/test_json \
sqlite3/test \ sqlite3/test \
@ -50,7 +48,7 @@ index badb2af35d..931cc3ed07 100644
ctypes/test \ ctypes/test \
idlelib/idle_test \ idlelib/idle_test \
distutils/tests \ distutils/tests \
@@ -1301,6 +1303,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ @@ -1267,6 +1265,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
test/test_tools test/test_warnings test/test_warnings/data \ test/test_tools test/test_warnings test/test_warnings/data \
unittest/test unittest/test/testmock unittest/test unittest/test/testmock
@ -65,7 +63,7 @@ index badb2af35d..931cc3ed07 100644
ifeq (@TEST_MODULES@,yes) ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += $(TESTSUBDIRS) LIBSUBDIRS += $(TESTSUBDIRS)
endif endif
@@ -1400,10 +1406,12 @@ ifeq (@PYC_BUILD@,yes) @@ -1366,10 +1372,12 @@ ifeq (@PYC_BUILD@,yes)
-d $(LIBDEST)/site-packages -f \ -d $(LIBDEST)/site-packages -f \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
endif endif
@ -99,7 +97,7 @@ diff --git a/setup.py b/setup.py
index 94dd337fef..76429e1326 100644 index 94dd337fef..76429e1326 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -2324,10 +2324,11 @@ def main(): @@ -2282,10 +2282,11 @@ def main():
import warnings import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning) warnings.filterwarnings("ignore",category=DeprecationWarning)

8
package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
View File

@ -7,8 +7,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[ Andrey Smirnov: ported to Python 3.6 ] [ Andrey Smirnov: ported to Python 3.6 ]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
Makefile.pre.in | 7 +++++-- Makefile.pre.in | 7 +++++--
configure.ac | 9 +++++++++ configure.ac | 9 +++++++++
@ -18,7 +16,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index 931cc3ed07..a1ce0712cd 100644 index 931cc3ed07..a1ce0712cd 100644
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -1237,7 +1237,6 @@ LIBSUBDIRS= tkinter site-packages \ @@ -1205,7 +1205,6 @@ LIBSUBDIRS= tkinter site-packages \
email email/mime \ email email/mime \
ensurepip ensurepip/_bundled \ ensurepip ensurepip/_bundled \
html json http dbm xmlrpc \ html json http dbm xmlrpc \
@ -26,7 +24,7 @@ index 931cc3ed07..a1ce0712cd 100644
logging csv wsgiref urllib \ logging csv wsgiref urllib \
ctypes ctypes/macholib \ ctypes ctypes/macholib \
idlelib idlelib/Icons \ idlelib idlelib/Icons \
@@ -1289,7 +1289,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ @@ -1255,7 +1254,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
test/test_asyncio \ test/test_asyncio \
test/test_email test/test_email/data \ test/test_email test/test_email/data \
test/test_json \ test/test_json \
@ -34,7 +32,7 @@ index 931cc3ed07..a1ce0712cd 100644
ctypes/test \ ctypes/test \
idlelib/idle_test \ idlelib/idle_test \
distutils/tests \ distutils/tests \
@@ -1307,6 +1305,11 @@ TESTSUBDIRS += lib2to3/tests \ @@ -1273,6 +1271,11 @@ TESTSUBDIRS += lib2to3/tests \
lib2to3/tests/data/fixers/myfixes lib2to3/tests/data/fixers/myfixes
endif endif

8
package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
View File

@ -7,8 +7,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[ Andrey Smirnov: ported to Python 3.6 ] [ Andrey Smirnov: ported to Python 3.6 ]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
Makefile.pre.in | 11 ++++++++--- Makefile.pre.in | 11 ++++++++---
configure.ac | 9 +++++++++ configure.ac | 9 +++++++++
@ -18,7 +16,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index a1ce0712cd..dc1e917cc3 100644 index a1ce0712cd..dc1e917cc3 100644
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -1231,7 +1231,7 @@ maninstall: altmaninstall @@ -1199,7 +1199,7 @@ maninstall: altmaninstall
# Install the library # Install the library
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
@ -27,7 +25,7 @@ index a1ce0712cd..dc1e917cc3 100644
asyncio \ asyncio \
collections concurrent concurrent/futures encodings \ collections concurrent concurrent/futures encodings \
email email/mime \ email email/mime \
@@ -1248,8 +1248,7 @@ LIBSUBDIRS= tkinter site-packages \ @@ -1216,8 +1216,7 @@ LIBSUBDIRS= tkinter site-packages \
venv venv/scripts venv/scripts/common venv/scripts/posix \ venv venv/scripts venv/scripts/common venv/scripts/posix \
curses curses
@ -37,7 +35,7 @@ index a1ce0712cd..dc1e917cc3 100644
test/audiodata \ test/audiodata \
test/capath test/data \ test/capath test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata \ test/cjkencodings test/decimaltestdata test/xmltestdata \
@@ -1297,6 +1296,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ @@ -1263,6 +1262,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
test/test_tools test/test_warnings test/test_warnings/data \ test/test_tools test/test_warnings test/test_warnings/data \
unittest/test unittest/test/testmock unittest/test unittest/test/testmock

6
package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
View File

@ -7,8 +7,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[ Andrey Smirnov: ported to Python 3.6 ] [ Andrey Smirnov: ported to Python 3.6 ]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
Makefile.pre.in | 7 +++++-- Makefile.pre.in | 7 +++++--
configure.ac | 9 +++++++++ configure.ac | 9 +++++++++
@ -18,7 +16,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index dc1e917cc3..6a6bc082cd 100644 index dc1e917cc3..6a6bc082cd 100644
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -1245,8 +1245,7 @@ LIBSUBDIRS= site-packages \ @@ -1213,8 +1213,7 @@ LIBSUBDIRS= site-packages \
turtledemo \ turtledemo \
multiprocessing multiprocessing/dummy \ multiprocessing multiprocessing/dummy \
unittest \ unittest \
@ -28,7 +26,7 @@ index dc1e917cc3..6a6bc082cd 100644
TESTSUBDIRS= test \ TESTSUBDIRS= test \
test/audiodata \ test/audiodata \
@@ -1302,6 +1301,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ @@ -1268,6 +1267,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
tkinter/test/test_ttk tkinter/test/test_ttk
endif endif

10
package/python3/0019-Add-an-option-to-disable-expat.patch
View File

@ -13,8 +13,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[ Andrey Smirnov: ported to Python 3.6 ] [ Andrey Smirnov: ported to Python 3.6 ]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
Makefile.pre.in | 6 +++++- Makefile.pre.in | 6 +++++-
configure.ac | 18 +++++++++++++----- configure.ac | 18 +++++++++++++-----
@ -25,7 +23,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index 6a6bc082cd..dc4b92b6fe 100644 index 6a6bc082cd..dc4b92b6fe 100644
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -1240,7 +1240,7 @@ LIBSUBDIRS= site-packages \ @@ -1208,7 +1208,7 @@ LIBSUBDIRS= site-packages \
logging csv wsgiref urllib \ logging csv wsgiref urllib \
ctypes ctypes/macholib \ ctypes ctypes/macholib \
idlelib idlelib/Icons \ idlelib idlelib/Icons \
@ -34,7 +32,7 @@ index 6a6bc082cd..dc4b92b6fe 100644
importlib \ importlib \
turtledemo \ turtledemo \
multiprocessing multiprocessing/dummy \ multiprocessing multiprocessing/dummy \
@@ -1305,6 +1305,10 @@ ifeq (@CURSES@,yes) @@ -1271,6 +1271,10 @@ ifeq (@CURSES@,yes)
LIBSUBDIRS += curses LIBSUBDIRS += curses
endif endif
@ -80,7 +78,7 @@ diff --git a/setup.py b/setup.py
index 76429e1326..38aa5e605e 100644 index 76429e1326..38aa5e605e 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -1525,7 +1525,7 @@ class PyBuildExt(build_ext): @@ -1495,7 +1495,7 @@ class PyBuildExt(build_ext):
# #
# More information on Expat can be found at www.libexpat.org. # More information on Expat can be found at www.libexpat.org.
# #
@ -88,7 +86,7 @@ index 76429e1326..38aa5e605e 100644
+ if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"): + if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"):
expat_inc = [] expat_inc = []
define_macros = [] define_macros = []
extra_compile_args = [] expat_lib = ['expat']
-- --
2.13.5 2.13.5

10
package/python3/0023-Add-an-option-to-disable-IDLE.patch
View File

@ -9,8 +9,6 @@ much sense to have it into our build.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
[ Andrey Smirnov: ported to Python 3.6 ] [ Andrey Smirnov: ported to Python 3.6 ]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
Makefile.pre.in | 7 ++++++- Makefile.pre.in | 7 ++++++-
configure.ac | 6 ++++++ configure.ac | 6 ++++++
@ -21,7 +19,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index dc4b92b6fe..3e43066d90 100644 index dc4b92b6fe..3e43066d90 100644
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -1194,7 +1194,9 @@ bininstall: altbininstall @@ -1162,7 +1162,9 @@ bininstall: altbininstall
-rm -f $(DESTDIR)$(LIBPC)/python3.pc -rm -f $(DESTDIR)$(LIBPC)/python3.pc
(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc) (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc)
-rm -f $(DESTDIR)$(BINDIR)/idle3 -rm -f $(DESTDIR)$(BINDIR)/idle3
@ -31,7 +29,7 @@ index dc4b92b6fe..3e43066d90 100644
-rm -f $(DESTDIR)$(BINDIR)/pydoc3 -rm -f $(DESTDIR)$(BINDIR)/pydoc3
ifeq (@PYDOC@,yes) ifeq (@PYDOC@,yes)
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
@@ -1239,7 +1241,6 @@ LIBSUBDIRS= site-packages \ @@ -1207,7 +1209,6 @@ LIBSUBDIRS= site-packages \
html json http dbm xmlrpc \ html json http dbm xmlrpc \
logging csv wsgiref urllib \ logging csv wsgiref urllib \
ctypes ctypes/macholib \ ctypes ctypes/macholib \
@ -39,7 +37,7 @@ index dc4b92b6fe..3e43066d90 100644
distutils distutils/command \ distutils distutils/command \
importlib \ importlib \
turtledemo \ turtledemo \
@@ -1309,6 +1310,10 @@ ifeq (@EXPAT@,yes) @@ -1275,6 +1276,10 @@ ifeq (@EXPAT@,yes)
LIBSUBDIRS += $(XMLLIBSUBDIRS) LIBSUBDIRS += $(XMLLIBSUBDIRS)
endif endif
@ -71,7 +69,7 @@ diff --git a/setup.py b/setup.py
index 38aa5e605e..d642825c1e 100644 index 38aa5e605e..d642825c1e 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -2324,11 +2324,13 @@ def main(): @@ -2282,11 +2282,13 @@ def main():
import warnings import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning) warnings.filterwarnings("ignore",category=DeprecationWarning)

4
package/python3/0024-Add-an-option-to-disable-decimal.patch
View File

@ -9,8 +9,6 @@ Python whether we want to use the system libmpdec (already installed),
the libmpdec builtin the Python sources, or no libmpdec at all. the libmpdec builtin the Python sources, or no libmpdec at all.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
configure.ac | 17 ++++++++++++----- configure.ac | 17 ++++++++++++-----
setup.py | 2 +- setup.py | 2 +-
@ -50,7 +48,7 @@ diff --git a/setup.py b/setup.py
index d642825c1e..5b98255857 100644 index d642825c1e..5b98255857 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -2100,7 +2100,7 @@ class PyBuildExt(build_ext): @@ -2058,7 +2058,7 @@ class PyBuildExt(build_ext):
def _decimal_ext(self): def _decimal_ext(self):
extra_compile_args = [] extra_compile_args = []
undef_macros = [] undef_macros = []

24
package/python3/0029-python-config.sh-don-t-reassign-prefix.patch
View File

@ -22,34 +22,32 @@ Fixes failures like the following:
dbus-python-1.2.4 | NOK | http://autobuild.buildroot.net/results/758858efa97b6273c1b470513f5492258a6d8853 dbus-python-1.2.4 | NOK | http://autobuild.buildroot.net/results/758858efa97b6273c1b470513f5492258a6d8853
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
[aduskett@gmail.com: Update for python 3.6.4]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
Misc/python-config.sh.in | 4 ++-- Misc/python-config.sh.in | 3 +--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
index 9e259c0..8b249d9 100644 index f905a71..e06be0f 100644
--- a/Misc/python-config.sh.in --- a/Misc/python-config.sh.in
+++ b/Misc/python-config.sh.in +++ b/Misc/python-config.sh.in
@@ -31,7 +31,7 @@ prefix_real=$(installed_prefix "$0") @@ -29,7 +29,7 @@ prefix_real=$(installed_prefix "$0")
# locations. Keep prefix & exec_prefix using their original values in case
# they are referenced in other configure variables, to prevent double # Use sed to fix paths from their built-to locations to their installed-to
# substitution, issue #22140. # locations.
-prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#") -prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#")
+prefix=$prefix_build +prefix=$prefix_build
exec_prefix_build="@exec_prefix@"
exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#") 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#") includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#")
@@ -49,7 +49,7 @@ LINKFORSHARED="@LINKFORSHARED@" @@ -47,7 +46,7 @@ LINKFORSHARED="@LINKFORSHARED@"
OPT="@OPT@" OPT="@OPT@"
PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
LDVERSION="@LDVERSION@" LDVERSION="@LDVERSION@"
-LIBDEST=${prefix_real}/lib/python${VERSION} -LIBDEST=${prefix}/lib/python${VERSION}
+LIBDEST=$( echo "${prefix}/lib/python${VERSION}" | sed "s#^$prefix_build#$prefix_real#") +LIBDEST=$( echo "${prefix}/lib/python${VERSION}" | sed "s#^$prefix_build#$prefix_real#")
LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#") LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#")
SO="@EXT_SUFFIX@" SO="@EXT_SUFFIX@"
PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
-- --
2.14.3 1.8.3.1

6
package/python3/python3.hash
View File

@ -1,4 +1,4 @@
# From https://www.python.org/downloads/release/python-364/ # From https://www.python.org/downloads/release/python-363/
md5 1325134dd525b4a2c3272a1a0214dd54 Python-3.6.4.tar.xz md5 b9c2c36c33fb89bda1fefd37ad5af9be Python-3.6.3.tar.xz
# Locally computed # Locally computed
sha256 159b932bf56aeaa76fd66e7420522d8c8853d486b8567c459b84fe2ed13bcaba Python-3.6.4.tar.xz sha256 cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da Python-3.6.3.tar.xz

2
package/python3/python3.mk
View File

@ -5,7 +5,7 @@
################################################################################ ################################################################################
PYTHON3_VERSION_MAJOR = 3.6 PYTHON3_VERSION_MAJOR = 3.6
PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).4 PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).3
PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION)
PYTHON3_LICENSE = Python-2.0, others PYTHON3_LICENSE = Python-2.0, others