mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

python: simplify/unify default build rules for python packages 

Most python packages use the same build rules & vars.
So, adding them in python-package.mk.

Also, preparing for using VARIANTs for python/python3 packages.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean 2017-01-04 11:25:47 +02:00
parent bb2f8fa8ed
commit 6d9137048b
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lang/python/files/python-host.mk
View File

@ -77,4 +77,20 @@ define Build/Compile/HostPyMod
$(3))
endef
define HostPy/Compile/Default
$(call Build/Compile/HostPyMod,,\
install --root="$(HOST_BUILD_PREFIX)" --prefix="" \
--single-version-externally-managed \
)
endef
ifeq ($(BUILD_VARIANT),python)
define Host/Compile
$(call HostPy/Compile/Default)
endef
define Host/Install
endef
endif # python
endif # __python_host_mk_inc

35
lang/python/files/python-package.mk
View File

@ -41,6 +41,15 @@ define PyPackage
endef
endif
ifndef PyPackage/$(1)/install
define PyPackage/$(1)/install
if [ -d $(PKG_INSTALL_DIR)/usr/bin ]; then \
$(INSTALL_DIR) $$(1)/usr/bin \
$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $$(1)/usr/bin/
fi
endef
endif
$(call shexport,PyPackage/$(1)/filespec)
define Package/$(1)/install
@ -115,21 +124,15 @@ define Build/Compile/PyMod
find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" -o -name "*\.exe" | xargs rm -f
endef
define PyMod/Default
define Build/Compile
$$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
endef
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $$(1)$(PYTHON_PKG_DIR) $$(1)/usr/bin
if [ -d $(PKG_INSTALL_DIR)/usr/bin ]; then find $(PKG_INSTALL_DIR)/usr/bin -mindepth 1 -maxdepth 1 -type f -exec $(CP) \{\} $$(1)/usr/bin/ \; ; fi
find $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR) -mindepth 1 -maxdepth 1 \( -type f -o -type d \) -exec $(CP) \{\} $$(1)$(PYTHON_PKG_DIR)/ \;
endef
define Build/InstallDev
$(INSTALL_DIR) $$(1)/usr/bin $$(1)$(PYTHON_PKG_DIR)
if [ -d $(PKG_INSTALL_DIR)/usr/bin ]; then find $(PKG_INSTALL_DIR)/usr/bin -mindepth 1 -maxdepth 1 -type f -exec $(CP) \{\} $$(1)/usr/bin/ \; ; fi
find $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR) -mindepth 1 -maxdepth 1 \( -type f -o -type d \) -exec $(CP) \{\} $$(1)$(PYTHON_PKG_DIR)/ \;
endef
define PyBuild/Compile/Default
$(call Build/Compile/PyMod,, \
install --prefix="/usr" --root="$(PKG_INSTALL_DIR)" \
--single-version-externally-managed \
)
endef
ifeq ($(BUILD_VARIANT),python)
define Build/Compile
$(call PyBuild/Compile/Default)
endef
endif # python