diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2015-12-11 16:32:20 +0200 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2015-12-11 16:32:20 +0200 |
| commit | 995bdfdcfaa81d8f5ab2ca34c98b4bb341c9cb9c (patch) | |
| tree | 05d836115bdfd9d3d7ac4f71b34cf9976dfa4412 /lang/python/files/python-package.mk | |
| parent | f0be8b0ea22cebe6542d57a0525fcc844ccbce4a (diff) | |
| parent | a8602a7ccbde983412b5f0f27961ff2ab9155194 (diff) | |
Merge pull request #2107 from commodo/python-2-7-11-upgrade
python: upgrade to version 2.7.11
Diffstat (limited to 'lang/python/files/python-package.mk')
| -rw-r--r-- | lang/python/files/python-package.mk | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/lang/python/files/python-package.mk b/lang/python/files/python-package.mk index b4be3a8ee..058c232f0 100644 --- a/lang/python/files/python-package.mk +++ b/lang/python/files/python-package.mk @@ -6,7 +6,7 @@ # PYTHON_VERSION:=2.7 -PYTHON_VERSION_MICRO:=10 +PYTHON_VERSION_MICRO:=11 PYTHON_DIR:=$(STAGING_DIR)/usr PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin @@ -17,21 +17,10 @@ PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages PYTHON:=python$(PYTHON_VERSION) -HOST_PYTHON_LIB_DIR:=$(STAGING_DIR_HOST)/lib/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) -define HostPython - ( export PYTHONPATH="$(PYTHONPATH)"; \ - export PYTHONOPTIMIZE=""; \ - export PYTHONDONTWRITEBYTECODE=1; \ - export _python_sysroot="$(STAGING_DIR)"; \ - 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. @@ -94,6 +83,8 @@ define PyPackage endef endef +$(call include_mk, python-host.mk) + # $(1) => build subdir # $(2) => additional arguments to setup.py # $(3) => additional variables @@ -114,6 +105,8 @@ define Build/Compile/PyMod $(3) \ , \ ./setup.py $(2) \ + , \ + $(PYTHONPATH) \ ) find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f endef |