Browse Source

python,python3: move PyPackage install rules in the beggining of the Package install rules

So that we can process Python sources installed
by those rules, if we need to.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
lilik-openwrt-22.03
Alexandru Ardelean 8 years ago
parent
commit
df0d0bcc00
3 changed files with 3 additions and 2 deletions
  1. +1
    -0
      lang/python/Makefile
  2. +1
    -1
      lang/python/files/python-package.mk
  3. +1
    -1
      lang/python3/files/python3-package.mk

+ 1
- 0
lang/python/Makefile View File

@ -259,6 +259,7 @@ $(subst $(space),$(newline),$(foreach lib_file,$(PYTHON_LIB_FILES_DEL),-|$(lib_f
endef
define PyPackage/python-base/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib
$(LN) python$(PYTHON_VERSION) $(1)/usr/bin/python
$(LN) python$(PYTHON_VERSION) $(1)/usr/bin/python2
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* $(1)/usr/lib/


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

@ -53,6 +53,7 @@ define PyPackage
$(call shexport,PyPackage/$(1)/filespec)
define Package/$(1)/install
$(call PyPackage/$(1)/install,$$(1))
find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" -o -name "*\.exe" | xargs rm -f
if [ -e files/python-package-install.sh ] ; then \
$(SHELL) files/python-package-install.sh \
@ -66,7 +67,6 @@ define PyPackage
echo "No 'python-package-install.sh' script found" ; \
exit 1 ; \
fi
$(call PyPackage/$(1)/install,$$(1))
endef
endef


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

@ -53,6 +53,7 @@ define Py3Package
$(call shexport,Py3Package/$(1)/filespec)
define Package/$(1)/install
$(call Py3Package/$(1)/install,$$(1))
find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" -o -name "*\.exe" | xargs rm -f
if [ -e files/python3-package-install.sh ] ; then \
$(SHELL) files/python3-package-install.sh \
@ -66,7 +67,6 @@ define Py3Package
echo "No 'python3-package-install.sh' script found" ; \
exit 1 ; \
fi
$(call Py3Package/$(1)/install,$$(1))
endef
endef


Loading…
Cancel
Save