cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases 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
parent 44180b6429 465c95ab71
commit 81545ba281
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/python-pip/Makefile
-2
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" \
) )
lang/python-setuptools/Makefile
-2
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" \
) )
lang/python/files/python-package.mk
+2
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)" \