forked from openwrt/packages
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Drop patch 016-adjust-config-paths.patch Implemented this differently; it was kind of on my todo-list, since this patch is a workaround for not dealing with PLATFORM_TRIPLET on OpenWrt. Refreshed other patches. Dropped 'patches-setuptools/004-site-patch.patch' Does not apply anymore. Setuptools has removed site.py support: pypa/setuptools#2165 If this is still needed, we may need to re-think it's implementation. Signed-off-by: Alexandru Ardelean <[email protected]>
- Loading branch information
Showing
14 changed files
with
37 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,12 +11,12 @@ include $(TOPDIR)/rules.mk | |
| include ../python3-version.mk | ||
|
|
||
| PKG_NAME:=python3 | ||
| PKG_RELEASE:=2 | ||
| PKG_RELEASE:=1 | ||
| PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) | ||
|
|
||
| PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz | ||
| PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION) | ||
| PKG_HASH:=e3003ed57db17e617acb382b0cade29a248c6026b1bd8aad1f976e9af66a83b0 | ||
| PKG_HASH:=9c73e63c99855709b9be0b3cc9e5b072cb60f37311e8c4e50f15576a0bf82854 | ||
|
|
||
| PKG_MAINTAINER:=Alexandru Ardelean <[email protected]>, Jeffery To <[email protected]> | ||
| PKG_LICENSE:=Python/2.0 | ||
|
|
@@ -140,6 +140,9 @@ DISABLE_BLUETOOTH:= \ | |
| ac_cv_header_bluetooth_bluetooth_h=no \ | ||
| ac_cv_header_bluetooth_h=no | ||
|
|
||
| CONFIGURE_VARS+= \ | ||
| PYTHON_FOR_BUILD="_PYTHON_PROJECT_BASE=$$(abs_builddir) _PYTHON_HOST_PLATFORM=$$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$$(shell test -f pybuilddir.txt && echo $$(abs_builddir)/`cat pybuilddir.txt`:)$$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata $(HOST_PYTHON3_BIN)" | ||
|
|
||
| CONFIGURE_ARGS+= \ | ||
| --enable-optimizations \ | ||
| --enable-shared \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 0 additions & 14 deletions
14
lang/python/python3/patches-setuptools/004-site-patch.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
lang/python/python3/patches/003-do-not-run-distutils-tests.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,8 +36,8 @@ Signed-off-by: Thomas Petazzoni <[email protected]> | |
| self.library_dirs.append('.') | ||
| --- a/Lib/distutils/sysconfig.py | ||
| +++ b/Lib/distutils/sysconfig.py | ||
| @@ -18,10 +18,17 @@ from .errors import DistutilsPlatformErr | ||
| from .util import get_platform, get_host_platform | ||
| @@ -17,10 +17,17 @@ import sys | ||
| from .errors import DistutilsPlatformError | ||
|
|
||
| # These are needed in a couple of spots, so just compute them once. | ||
| -PREFIX = os.path.normpath(sys.prefix) | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
lang/python/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 15 additions & 73 deletions
88
lang/python/python3/patches/016-adjust-config-paths.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,80 +1,22 @@ | ||
| --- a/Lib/distutils/sysconfig.py | ||
| +++ b/Lib/distutils/sysconfig.py | ||
| @@ -445,6 +445,7 @@ def _init_posix(): | ||
| platform=sys.platform, | ||
| multiarch=getattr(sys.implementation, '_multiarch', ''), | ||
| )) | ||
| + name = '_sysconfigdata' | ||
| _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) | ||
| build_time_vars = _temp.build_time_vars | ||
| global _config_vars | ||
| --- a/Lib/sysconfig.py | ||
| +++ b/Lib/sysconfig.py | ||
| @@ -344,6 +344,7 @@ def get_makefile_filename(): | ||
|
|
||
|
|
||
| def _get_sysconfigdata_name(): | ||
| + return '_sysconfigdata' | ||
| return os.environ.get('_PYTHON_SYSCONFIGDATA_NAME', | ||
| '_sysconfigdata_{abi}_{platform}_{multiarch}'.format( | ||
| abi=sys.abiflags, | ||
| --- a/Makefile.pre.in | ||
| +++ b/Makefile.pre.in | ||
| @@ -1460,7 +1460,7 @@ libinstall: build_all $(srcdir)/Modules/ | ||
| esac; \ | ||
| done; \ | ||
| done | ||
| - $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \ | ||
| + $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata*.py \ | ||
| $(DESTDIR)$(LIBDEST); \ | ||
| $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt | ||
| ifeq (@COMPILE_ALL_TESTS@,yes) | ||
| @@ -1618,7 +1618,7 @@ sharedinstall: sharedmods | ||
| --install-scripts=$(BINDIR) \ | ||
| --install-platlib=$(DESTSHARED) \ | ||
| --root=$(DESTDIR)/ | ||
| - -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py | ||
| + -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata*.py | ||
| -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__ | ||
|
|
||
| # Here are a couple of targets for MacOSX again, to install a full | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -2951,7 +2951,7 @@ $as_echo_n "checking for python interpre | ||
| fi | ||
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5 | ||
| $as_echo "$interp" >&6; } | ||
| - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp | ||
| + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata '$interp | ||
| fi | ||
| elif test "$cross_compiling" = maybe; then | ||
| as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5 | ||
| @@ -15213,7 +15213,7 @@ else | ||
| @@ -5354,6 +5354,8 @@ $as_echo "none" >&6; } | ||
| fi | ||
| rm -f conftest.c conftest.out | ||
|
|
||
|
|
||
| -if test x$PLATFORM_TRIPLET = x; then | ||
| +if true ; then | ||
| LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" | ||
| else | ||
| LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" | ||
| +PLATFORM_TRIPLET= | ||
| + | ||
| if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then | ||
| if test x$PLATFORM_TRIPLET != x$MULTIARCH; then | ||
| as_fn_error $? "internal configure error for the platform triplet, please file a bug report" "$LINENO" 5 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -75,7 +75,7 @@ if test "$cross_compiling" = yes; then | ||
| AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) | ||
| fi | ||
| AC_MSG_RESULT($interp) | ||
| - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp | ||
| + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata '$interp | ||
| fi | ||
| elif test "$cross_compiling" = maybe; then | ||
| AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) | ||
| @@ -4688,7 +4688,7 @@ fi | ||
| @@ -876,6 +876,8 @@ else | ||
| fi | ||
| rm -f conftest.c conftest.out | ||
|
|
||
| dnl define LIBPL after ABIFLAGS and LDVERSION is defined. | ||
| AC_SUBST(PY_ENABLE_SHARED) | ||
| -if test x$PLATFORM_TRIPLET = x; then | ||
| +if true ; then | ||
| LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" | ||
| else | ||
| LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" | ||
| +PLATFORM_TRIPLET= | ||
| + | ||
| if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then | ||
| if test x$PLATFORM_TRIPLET != x$MULTIARCH; then | ||
| AC_MSG_ERROR([internal configure error for the platform triplet, please file a bug report]) |