Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #619 from commodo/python-cleanup

Browse source 
Python cleanup
This commit is contained in:
Steven Barth 2014-12-09 12:38:09 +01:00
commit 81545ba281
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lang/python-pip/Makefile
View file

@ -34,9 +34,7 @@ define Package/python-pip/description
A tool for installing and managing Python packages. A tool for installing and managing Python packages.
endef endef
PYTHONPATH:=$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
define Build/Compile define Build/Compile
$(INSTALL_DIR) $(PYTHONPATH)
$(call Build/Compile/PyMod,,\ $(call Build/Compile/PyMod,,\
install --prefix="$(PKG_INSTALL_DIR)/usr" \ install --prefix="$(PKG_INSTALL_DIR)/usr" \
) )

2
lang/python-setuptools/Makefile
View file

@ -33,9 +33,7 @@ define Package/python-setuptools/description
Easily download, build, install, upgrade, and uninstall Python packages Easily download, build, install, upgrade, and uninstall Python packages
endef endef
PYTHONPATH:=$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
define Build/Compile define Build/Compile
$(INSTALL_DIR) $(PYTHONPATH)
$(call Build/Compile/PyMod,,\ $(call Build/Compile/PyMod,,\
install --prefix="$(PKG_INSTALL_DIR)/usr" \ install --prefix="$(PKG_INSTALL_DIR)/usr" \
) )

2
lang/python/files/python-package.mk
View file

@ -21,6 +21,7 @@ HOST_PYTHON_LIB_DIR:=$(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION)
HOST_PYTHON_BIN:=$(STAGING_DIR_HOST)/bin/python2 HOST_PYTHON_BIN:=$(STAGING_DIR_HOST)/bin/python2
PYTHONPATH:=$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR) PYTHONPATH:=$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR)
PYTHONPATH+=:$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
define HostPython define HostPython
( export PYTHONPATH="$(PYTHONPATH)"; \ ( export PYTHONPATH="$(PYTHONPATH)"; \
export PYTHONOPTIMIZE=""; \ export PYTHONOPTIMIZE=""; \
@ -79,6 +80,7 @@ endef
# $(2) => additional arguments to setup.py # $(2) => additional arguments to setup.py
# $(3) => additional variables # $(3) => additional variables
define Build/Compile/PyMod define Build/Compile/PyMod
$(INSTALL_DIR) $(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
$(call HostPython, \ $(call HostPython, \
cd $(PKG_BUILD_DIR)/$(strip $(1)); \ cd $(PKG_BUILD_DIR)/$(strip $(1)); \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \