diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2016-03-05 02:09:05 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2016-03-05 02:30:12 +0800 |
| commit | b70b978cc61bdd6fcdc7f8f7bae8ee3ef16baf4a (patch) | |
| tree | 6f8141e7575bfe70cfb153d0a7100b4a15df111f /lang/python/files | |
| parent | d43df25b1f3d2ef811f10d4f3297c6c42624b2f4 (diff) | |
python: use default host build prefix, remove cross-compile workarounds for host
The sets host Python's prefix and exec-prefix to the same value
($(STAGING_DIR)/host for packages, as currently defined in
include/host-build.mk), which avoids the case where pyconfig.h is
not in the same location as Python's other header files (see
https://bugs.python.org/issue896330).
This also removes some cross compilation workarounds
(_python_sysroot/prefix/exec_prefix, disabling byte-compilation,
__PYVENV_LAUNCHER__) that are not necessary when compiling packages
for host.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'lang/python/files')
| -rw-r--r-- | lang/python/files/python-host.mk | 27 | ||||
| -rw-r--r-- | lang/python/files/python-package.mk | 5 |
2 files changed, 13 insertions, 19 deletions
diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk index 7831eb683..0327f3ad2 100644 --- a/lang/python/files/python-host.mk +++ b/lang/python/files/python-host.mk @@ -1,38 +1,36 @@ # -# Copyright (C) 2015 OpenWrt.org +# Copyright (C) 2015-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -HOST_PYTHON_INC_DIR:=$(STAGING_DIR)/host/usr/include/python$(PYTHON_VERSION) +HOST_PYTHON_DIR:=$(STAGING_DIR)/host +HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION) +HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION) -HOST_PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages +HOST_PYTHON_PKG_DIR:=/lib/python$(PYTHON_VERSION)/site-packages + +HOST_PYTHON_BIN:=$(HOST_PYTHON_DIR)/bin/python$(PYTHON_VERSION) HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(STAGING_DIR)/host/$(HOST_PYTHON_PKG_DIR) + define HostPython if [ "$(strip $(3))" == "HOST" ]; then \ export PYTHONPATH="$(HOST_PYTHONPATH)"; \ - export _python_sysroot="$(STAGING_DIR)/host"; \ + export PYTHONDONTWRITEBYTECODE=0; \ else \ export PYTHONPATH="$(PYTHONPATH)"; \ + export PYTHONDONTWRITEBYTECODE=1; \ export _python_sysroot="$(STAGING_DIR)"; \ + export _python_prefix="/usr"; \ + export _python_exec_prefix="/usr"; \ fi; \ export PYTHONOPTIMIZE=""; \ - export PYTHONDONTWRITEBYTECODE=1; \ - export _python_prefix="/usr"; \ - export _python_exec_prefix="/usr"; \ $(1) \ $(HOST_PYTHON_BIN) $(2); endef -# These configure args are needed in detection of path to Python header files -# using autotools. -HOST_CONFIGURE_ARGS += \ - _python_sysroot="$(STAGING_DIR)/host" \ - _python_prefix="/usr" \ - _python_exec_prefix="/usr" - # $(1) => build subdir # $(2) => additional arguments to setup.py # $(3) => additional variables @@ -48,7 +46,6 @@ define Build/Compile/HostPyMod CPPFLAGS="$(HOST_CPPFLAGS) -I$(HOST_PYTHON_INC_DIR)" \ LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION)" \ _PYTHON_HOST_PLATFORM=linux2 \ - __PYVENV_LAUNCHER__="/usr/bin/$(PYTHON)" \ $(3) \ , \ ./setup.py $(2) \ diff --git a/lang/python/files/python-package.mk b/lang/python/files/python-package.mk index e8c049224..1f6771845 100644 --- a/lang/python/files/python-package.mk +++ b/lang/python/files/python-package.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -17,9 +17,6 @@ PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages PYTHON:=python$(PYTHON_VERSION) -HOST_PYTHON_LIB_DIR:=$(STAGING_DIR)/host/usr/lib/python$(PYTHON_VERSION) -HOST_PYTHON_BIN:=$(STAGING_DIR)/host/bin/python2 - PYTHONPATH:=$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR) # These configure args are needed in detection of path to Python header files |