diff options
Diffstat (limited to 'lang/python')
| -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 + |