matthias/buildroot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

package: add python3 support in the package infrastructure

Browse Source 
This commit improves the Python package infrastructure to allow Python
packages to be built with Python 3. The changes are fairly simple:

 * Use either PYTHON_PATH or PYTHON3_PATH as the PYTHONPATH depending
   on which Python is used.

 * Depend on host-python or host-python3 and python or python3
   depending on which Python is used.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni
2014-02-18 21:40:03 +01:00
committed by Peter Korsgaard
parent eb7667bf41
commit 24cbcf13f9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package/pkg-python.mk
View File

@@ -27,7 +27,7 @@ PKG_PYTHON_DISTUTILS_ENV = \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \
LDSHARED="$(TARGET_CROSS)gcc -shared" \ LDSHARED="$(TARGET_CROSS)gcc -shared" \
PYTHONPATH="$(PYTHON_PATH)" \ PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
_python_sysroot=$(STAGING_DIR) \ _python_sysroot=$(STAGING_DIR) \
_python_prefix=/usr \ _python_prefix=/usr \
_python_exec_prefix=/usr _python_exec_prefix=/usr
@@ -48,7 +48,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
# Target setuptools-based packages # Target setuptools-based packages
PKG_PYTHON_SETUPTOOLS_ENV = \ PKG_PYTHON_SETUPTOOLS_ENV = \
PATH="$(TARGET_PATH)" \ PATH="$(TARGET_PATH)" \
PYTHONPATH="$(PYTHON_PATH)" \ PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
_python_sysroot=$(STAGING_DIR) \ _python_sysroot=$(STAGING_DIR) \
_python_prefix=/usr \ _python_prefix=/usr \
_python_exec_prefix=/usr _python_exec_prefix=/usr
@@ -138,16 +138,16 @@ endif
# depending on the package characteristics, and shouldn't be derived # depending on the package characteristics, and shouldn't be derived
# automatically from the dependencies of the corresponding target # automatically from the dependencies of the corresponding target
# package. # package.
$(2)_DEPENDENCIES ?= $(filter-out host-python host-python-setuptools host-toolchain $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) $(2)_DEPENDENCIES ?= $(filter-out host-python host-python3 host-python-setuptools host-toolchain $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
# Target packages need both the python interpreter on the target (for # Target packages need both the python interpreter on the target (for
# runtime) and the python interpreter on the host (for # runtime) and the python interpreter on the host (for
# compilation). However, host packages only need the python # compilation). However, host packages only need the python
# interpreter on the host. # interpreter on the host.
ifeq ($(4),target) ifeq ($(4),target)
$(2)_DEPENDENCIES += host-python python $(2)_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python)
else else
$(2)_DEPENDENCIES += host-python $(2)_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python)
endif endif
# Setuptools based packages will need host-python-setuptools (both # Setuptools based packages will need host-python-setuptools (both