mirror of
https://github.com/openwrt/packages.git
synced 2026-01-10 11:44:48 +00:00
python,python3: do not install .mk snippets
The .mk snippets are not really usable at the moment, as they cannot be considered for metadata collection (package DUMP) when included through include_mk. Python packages do not use include_mk anymore for this reason, so the install commands can be removed as well. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
committed by
Alexandru Ardelean
parent
c6b24960cd
commit
55c0b5ae19
@@ -190,16 +190,6 @@ define Build/Compile
|
|||||||
$(call Build/Compile/python-pip)
|
$(call Build/Compile/python-pip)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/InstallMkFiles
|
|
||||||
$(INSTALL_DIR) $(STAGING_DIR)/mk/
|
|
||||||
$(INSTALL_DATA) \
|
|
||||||
./files/python-package.mk \
|
|
||||||
./files/python-host.mk \
|
|
||||||
./files/python-version.mk \
|
|
||||||
./files/python-package-install.sh \
|
|
||||||
$(STAGING_DIR)/mk/
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/InstallDev
|
define Build/InstallDev
|
||||||
$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/ $(1)/usr/lib/pkgconfig
|
$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/ $(1)/usr/lib/pkgconfig
|
||||||
$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
|
$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
|
||||||
@@ -218,7 +208,6 @@ define Build/InstallDev
|
|||||||
$(CP) \
|
$(CP) \
|
||||||
$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \
|
$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \
|
||||||
$(1)/usr/lib/python$(PYTHON_VERSION)/
|
$(1)/usr/lib/python$(PYTHON_VERSION)/
|
||||||
$(call Build/InstallMkFiles)
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
PYTHON_BASE_LIB_FILES:= \
|
PYTHON_BASE_LIB_FILES:= \
|
||||||
@@ -298,7 +287,6 @@ define Host/Compile
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define Host/Install
|
define Host/Install
|
||||||
$(call Build/InstallMkFiles)
|
|
||||||
$(MAKE) -C $(HOST_BUILD_DIR) install
|
$(MAKE) -C $(HOST_BUILD_DIR) install
|
||||||
$(INSTALL_DIR) $(HOST_PYTHON_DIR)/bin/
|
$(INSTALL_DIR) $(HOST_PYTHON_DIR)/bin/
|
||||||
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON_DIR)/bin/pgen2
|
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON_DIR)/bin/pgen2
|
||||||
|
|||||||
@@ -194,16 +194,6 @@ define Build/Compile
|
|||||||
$(call Build/Compile/python3-pip)
|
$(call Build/Compile/python3-pip)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/InstallMkFiles
|
|
||||||
$(INSTALL_DIR) $(STAGING_DIR)/mk/
|
|
||||||
$(INSTALL_DATA) \
|
|
||||||
./files/python3-package.mk \
|
|
||||||
./files/python3-host.mk \
|
|
||||||
./files/python3-version.mk \
|
|
||||||
./files/python3-package-install.sh \
|
|
||||||
$(STAGING_DIR)/mk/
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/InstallDev
|
define Build/InstallDev
|
||||||
$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/
|
$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/
|
||||||
$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
|
$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
|
||||||
@@ -217,7 +207,6 @@ define Build/InstallDev
|
|||||||
$(CP) \
|
$(CP) \
|
||||||
$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config-$(PYTHON_VERSION) \
|
$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config-$(PYTHON_VERSION) \
|
||||||
$(1)/usr/lib/python$(PYTHON_VERSION)/
|
$(1)/usr/lib/python$(PYTHON_VERSION)/
|
||||||
$(call Build/InstallMkFiles)
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
PYTHON3_BASE_LIB_FILES:= \
|
PYTHON3_BASE_LIB_FILES:= \
|
||||||
@@ -295,7 +284,6 @@ define Host/Compile
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define Host/Install
|
define Host/Install
|
||||||
$(call Build/InstallMkFiles)
|
|
||||||
$(MAKE) -C $(HOST_BUILD_DIR) install
|
$(MAKE) -C $(HOST_BUILD_DIR) install
|
||||||
$(INSTALL_DIR) $(HOST_PYTHON3_DIR)/bin/
|
$(INSTALL_DIR) $(HOST_PYTHON3_DIR)/bin/
|
||||||
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON3_DIR)/bin/pgen3
|
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON3_DIR)/bin/pgen3
|
||||||
|
|||||||
Reference in New Issue
Block a user