diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2021-02-16 22:23:50 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2021-02-17 00:01:41 +0800 |
| commit | 18330902a0ca1b162e1ae938d8024cfb7e7c524d (patch) | |
| tree | a2db35a0bde50e45dedb63341cda93139de90c5b /lang | |
| parent | eea050dab82c7cefb44fd4ab1e705b3378e7fa06 (diff) | |
python3: Fix target python-config when building on macOS
The Python version of python-config is installed when building on macOS,
rather than the shell script version when building on Linux. When run on
macOS, the Python version of python-config will return values with
Mac-specific customizations.
This patches the python-config install recipe so that which version is
installed can be controlled by the package makefile. When building on
macOS, this installs the Python version for host Python and the shell
script version for target Python.
This also updates Host/Compile and Host/Install to use the default host
build recipes, so that the various HOST_* variables are taken into
account automatically.
Fixes https://github.com/openwrt/packages/issues/14652
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python/python3/Makefile | 10 | ||||
| -rw-r--r-- | lang/python/python3/patches/025-choose-python-config-version.patch | 11 |
2 files changed, 17 insertions, 4 deletions
diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 99e71d383..241b84602 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk include ../python3-version.mk PKG_NAME:=python3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz @@ -299,6 +299,8 @@ endif ifeq ($(HOST_OS),Darwin) HOST_CONFIGURE_VARS += \ ac_cv_header_libintl_h=no +HOST_MAKE_VARS += \ + USE_PYTHON_CONFIG_PY=1 endif HOST_CONFIGURE_ARGS+= \ @@ -315,8 +317,8 @@ define Host/Configure endef define Host/Compile - +$(HOST_MAKE_VARS) $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) python - +$(HOST_MAKE_VARS) $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) sharedmods + $(call Host/Compile/Default,python) + $(call Host/Compile/Default,sharedmods) endef define Host/Install @@ -336,7 +338,7 @@ define Host/Install $(HOST_PYTHON3_PKG_DIR)/.pip-patched* \ $(HOST_PYTHON3_PKG_DIR)/.pip_installed_* ) - $(MAKE) -C $(HOST_BUILD_DIR) install + $(call Host/Install/Default) $(if $(wildcard $(HOST_PYTHON3_PKG_DIR)/.setuptools_installed_$(PYTHON3_SETUPTOOLS_VERSION)-$(PYTHON3_SETUPTOOLS_PKG_RELEASE)),, $(call HostPatchDir,$(HOST_PYTHON3_PKG_DIR),./patches-setuptools,) touch $(HOST_PYTHON3_PKG_DIR)/.setuptools_installed_$(PYTHON3_SETUPTOOLS_VERSION)-$(PYTHON3_SETUPTOOLS_PKG_RELEASE) diff --git a/lang/python/python3/patches/025-choose-python-config-version.patch b/lang/python/python3/patches/025-choose-python-config-version.patch new file mode 100644 index 000000000..562fd2e46 --- /dev/null +++ b/lang/python/python3/patches/025-choose-python-config-version.patch @@ -0,0 +1,11 @@ +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1586,7 +1586,7 @@ python-config: $(srcdir)/Misc/python-con + @ # On Darwin, always use the python version of the script, the shell + @ # version doesn't use the compiler customizations that are provided + @ # in python (_osx_support.py). +- @if test `uname -s` = Darwin; then \ ++ @if test "$(USE_PYTHON_CONFIG_PY)" = 1; then \ + cp python-config.py python-config; \ + fi + |