Browse Source

Merge pull request #619 from commodo/python-cleanup

Python cleanup
lilik-openwrt-22.03
Steven Barth 10 years ago
parent
commit
81545ba281
3 changed files with 2 additions and 4 deletions
  1. +0
    -2
      lang/python-pip/Makefile
  2. +0
    -2
      lang/python-setuptools/Makefile
  3. +2
    -0
      lang/python/files/python-package.mk

+ 0
- 2
lang/python-pip/Makefile View File

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


+ 0
- 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
endef
PYTHONPATH:=$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
define Build/Compile
$(INSTALL_DIR) $(PYTHONPATH)
$(call Build/Compile/PyMod,,\
install --prefix="$(PKG_INSTALL_DIR)/usr" \
)


+ 2
- 0
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
PYTHONPATH:=$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR)
PYTHONPATH+=:$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
define HostPython
( export PYTHONPATH="$(PYTHONPATH)"; \
export PYTHONOPTIMIZE=""; \
@ -79,6 +80,7 @@ endef
# $(2) => additional arguments to setup.py
# $(3) => additional variables
define Build/Compile/PyMod
$(INSTALL_DIR) $(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
$(call HostPython, \
cd $(PKG_BUILD_DIR)/$(strip $(1)); \
CC="$(TARGET_CC)" \


Loading…
Cancel
Save