python3: Rename canned recipes in python3-host.mk

This changes the recipe name prefix from Build/Compile/HostPy3 to
HostPython3, and clarifies some of the names (RunHost to Run, Mod to
ModSetup).

Signed-off-by: Jeffery To <redacted>

diff --git a/lang/python/python-six/Makefile b/lang/python/python-six/Makefile
index 3f0250d26c6aa282c1c2276c40ca0fb5b98b3b79..70c90a91a6ff177eae548d9cc8be805d8be2b1da 100644 (file)
--- a/lang/python/python-six/Makefile
+++ b/lang/python/python-six/Makefile
@@ -49,7 +49,7 @@ documentation for more information on what is provided.
 endef
 
 define Host/Compile
-       $(call Build/Compile/HostPy3Mod,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)")
+       $(call HostPython3/ModSetup,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)")
 endef
 
 Host/Install:=

diff --git a/lang/python/python3-host.mk b/lang/python/python3-host.mk
index e8a375d13783a621e7b8d7d9457e041e78453bbd..81b0025b1770af8d953e2d7773a99859b7981354 100644 (file)
--- a/lang/python/python3-host.mk
+++ b/lang/python/python3-host.mk
@@ -5,7 +5,7 @@
 # See /LICENSE for more information.
 #
 
-# Note: include this after `include $(TOPDIR)/rules.mk in your package Makefile
+# Note: include this file after `include $(TOPDIR)/rules.mk in your package Makefile
 #       if `python3-package.mk` is included, this will already be included
 
 # For PYTHON3_VERSION
@@ -40,7 +40,7 @@ HOST_PYTHON3_VARS = \
 # $(1) => directory of python script
 # $(2) => python script and its arguments
 # $(3) => additional variables
-define Build/Compile/HostPy3RunHost
+define HostPython3/Run
        cd "$(if $(strip $(1)),$(strip $(1)),.)" && \
        $(HOST_PYTHON3_VARS) \
        $(3) \
@@ -51,7 +51,7 @@ endef
 HOST_PYTHON3_PIP:=$(STAGING_DIR_HOSTPKG)/bin/pip$(PYTHON3_VERSION)
 
 # $(1) => packages to install
-define Build/Compile/HostPy3PipInstall
+define HostPython3/PipInstall
        $(HOST_PYTHON3_VARS) \
        $(HOST_PYTHON3_PIP) \
                --disable-pip-version-check \
@@ -63,8 +63,8 @@ endef
 # $(1) => build subdir
 # $(2) => additional arguments to setup.py
 # $(3) => additional variables
-define Build/Compile/HostPy3Mod
-       $(call Build/Compile/HostPy3RunHost, \
+define HostPython3/ModSetup
+       $(call HostPython3/Run, \
                $(HOST_BUILD_DIR)/$(strip $(1)), \
                setup.py $(2), \
                $(3))

diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk
index 0571bb271f8360a0532ea44a871b357966d6b041..88ab726eb03d3753a178acc9da772eafc65d8fae 100644 (file)
--- a/lang/python/python3-package.mk
+++ b/lang/python/python3-package.mk
@@ -142,7 +142,7 @@ PYTHON3_PKG_SETUP_VARS ?=
 
 define Py3Build/Compile/Default
        $(if $(HOST_PYTHON3_PACKAGE_BUILD_DEPENDS),
-               $(call Build/Compile/HostPy3PipInstall,$(HOST_PYTHON3_PACKAGE_BUILD_DEPENDS))
+               $(call HostPython3/PipInstall,$(HOST_PYTHON3_PACKAGE_BUILD_DEPENDS))
        )
        $(call Build/Compile/Py3Mod, \
                $(PYTHON3_PKG_SETUP_DIR), \

diff --git a/lang/python/python3-packages/Makefile b/lang/python/python3-packages/Makefile
index e3c8f6225bbb96376d3a52fbce41732c3099f6db..4310fe9204473f8232f613e581b5dd55caac9fed 100644 (file)
--- a/lang/python/python3-packages/Makefile
+++ b/lang/python/python3-packages/Makefile
@@ -101,7 +101,7 @@ HOST_PYTHON3_PIP_INSTALL_CLEANUP:=$(call HOST_PYTHON3_PIP_INSTALL,$(PKG_INSTALL_
 
 define Build/Compile
        $(foreach pkg,$(CONFIG_PACKAGE_python3-packages-list-host),
-               $(call Build/Compile/HostPy3RunHost,,$(HOST_PYTHON3_PIP_INSTALL_HOST) $(pkg))
+               $(call HostPython3/Run,,$(HOST_PYTHON3_PIP_INSTALL_HOST) $(pkg))
        )
        $(foreach pkg,$(CONFIG_PACKAGE_python3-packages-list),
                $(call Build/Compile/HostPy3RunTarget,,$(call HOST_PYTHON3_PIP_INSTALL_TARGET,$(pkg)) $(pkg),$(CONFIG_PACKAGE_python3-packages-envs))

diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile
index 4e315ef846a196d1ddefcd4c3a01c5fcc8eaf47e..295c7f9f9de2ab61af6a50bc8acbe971eae4beeb 100644 (file)
--- a/net/seafile-seahub/Makefile
+++ b/net/seafile-seahub/Makefile
@@ -76,7 +76,7 @@ MAKE_VARS += \
        DJANGO_ADMIN_PY="$(STAGING_DIR_HOSTPKG)/bin/django-admin"
 
 define Py3Build/Compile
-       $(call Build/Compile/HostPy3PipInstall,$(HOST_PYTHON3_PACKAGE_BUILD_DEPENDS))
+       $(call HostPython3/PipInstall,$(HOST_PYTHON3_PACKAGE_BUILD_DEPENDS))
        $(call Build/Compile/Default,locale)
        $(INSTALL_DIR) $(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)
 endef