diff options
| author | aTanW <villy@sft.ru> | 2015-06-28 17:58:00 +0300 |
|---|---|---|
| committer | aTanW <villy@sft.ru> | 2015-06-28 17:58:00 +0300 |
| commit | f60ca0b30f92dea792e776db08d7f109c172be58 (patch) | |
| tree | 5e200b2eb9bbd074e79d68014339dc823ac2db56 /lang/python/files/python-package.mk | |
| parent | 2564e407d26d45ecc68befa7a3d1786dbb5982b5 (diff) | |
| parent | 9d423ba553041b5d45918b6ebd8677e43990cb88 (diff) | |
Merge https://github.com/openwrt/packages
Conflicts:
net/ipsec-tools/Makefile
Diffstat (limited to 'lang/python/files/python-package.mk')
| -rw-r--r-- | lang/python/files/python-package.mk | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lang/python/files/python-package.mk b/lang/python/files/python-package.mk index c8cbcda57..5ab35195d 100644 --- a/lang/python/files/python-package.mk +++ b/lang/python/files/python-package.mk @@ -1,12 +1,12 @@ # -# Copyright (C) 2007-2014 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # PYTHON_VERSION:=2.7 -PYTHON_VERSION_MICRO:=9 +PYTHON_VERSION_MICRO:=10 PYTHON_DIR:=$(STAGING_DIR)/usr PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin @@ -25,11 +25,21 @@ 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. +CONFIGURE_ARGS += \ + _python_sysroot="$(STAGING_DIR)" \ + _python_prefix="/usr" \ + _python_exec_prefix="/usr" + PKG_USE_MIPS16:=0 # This is required in addition to PKG_USE_MIPS16:=0 because otherwise MIPS16 # flags are inherited from the Python base package (via sysconfig module) |