Browse Source

python,python3: Fix calling default PyPackage/install

This fixes Package/*/install to call PyPackage/*/install correctly.
Previously, if a package used the default PyPackage/*/install, then it
would not called. (A custom-defined PyPackage/*/install would be called
with no issue.)

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
lilik-openwrt-22.03
Jeffery To 6 years ago
parent
commit
200a5a2eec
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      lang/python/python-package.mk
  2. +1
    -1
      lang/python/python3-package.mk

+ 1
- 1
lang/python/python-package.mk View File

@ -68,7 +68,7 @@ define PyPackage
$(call shexport,PyPackage/$(1)/filespec) $(call shexport,PyPackage/$(1)/filespec)
define Package/$(1)/install define Package/$(1)/install
$(call PyPackage/$(1)/install,$$(1))
$$(call PyPackage/$(1)/install,$$(1))
$(SHELL) $(python_mk_path)python-package-install.sh "2" \ $(SHELL) $(python_mk_path)python-package-install.sh "2" \
"$(PKG_INSTALL_DIR)" "$$(1)" \ "$(PKG_INSTALL_DIR)" "$$(1)" \
"$(HOST_PYTHON_BIN)" "$$(2)" \ "$(HOST_PYTHON_BIN)" "$$(2)" \


+ 1
- 1
lang/python/python3-package.mk View File

@ -67,7 +67,7 @@ define Py3Package
$(call shexport,Py3Package/$(1)/filespec) $(call shexport,Py3Package/$(1)/filespec)
define Package/$(1)/install define Package/$(1)/install
$(call Py3Package/$(1)/install,$$(1))
$$(call Py3Package/$(1)/install,$$(1))
$(SHELL) $(python3_mk_path)python-package-install.sh "3" \ $(SHELL) $(python3_mk_path)python-package-install.sh "3" \
"$(PKG_INSTALL_DIR)" "$$(1)" \ "$(PKG_INSTALL_DIR)" "$$(1)" \
"$(HOST_PYTHON3_BIN)" "$$(2)" \ "$(HOST_PYTHON3_BIN)" "$$(2)" \


Loading…
Cancel
Save