openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-24 06:18:21 +04:00
Code Issues Packages Projects Releases Wiki Activity

python,python3: move .exe removal in python-package-install.sh script

Browse Source 
It's a common operation for both Python & Python3, so move it to the
script `python-package-install.sh` script.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean
2019-02-04 16:10:08 +02:00
parent f5181d615c
commit 14d0a9c58d
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lang/python/python-package-install.sh
View File

@@ -47,6 +47,8 @@ python="$4"
mode="$5" mode="$5"
filespec="$6" filespec="$6"
find "$src_dir" -name "*\.exe" | xargs rm -f
process_filespec "$src_dir" "$dst_dir" "$filespec" || { process_filespec "$src_dir" "$dst_dir" "$filespec" || {
echo "process filespec error-ed" echo "process filespec error-ed"
exit 1 exit 1

2
lang/python/python-package.mk
View File

@@ -69,7 +69,6 @@ define PyPackage
define Package/$(1)/install define Package/$(1)/install
$(call PyPackage/$(1)/install,$$(1)) $(call PyPackage/$(1)/install,$$(1))
find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
$(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)" \
@@ -113,7 +112,6 @@ define Build/Compile/PyMod
cd $(PKG_BUILD_DIR)/$(strip $(1)), \ cd $(PKG_BUILD_DIR)/$(strip $(1)), \
./setup.py $(2), \ ./setup.py $(2), \
$(3)) $(3))
find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
endef endef
PYTHON_PKG_SETUP_ARGS:=--single-version-externally-managed PYTHON_PKG_SETUP_ARGS:=--single-version-externally-managed

2
lang/python/python3-package.mk
View File

@@ -68,7 +68,6 @@ define Py3Package
define Package/$(1)/install define Package/$(1)/install
$(call Py3Package/$(1)/install,$$(1)) $(call Py3Package/$(1)/install,$$(1))
find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
$(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)" \
@@ -112,7 +111,6 @@ define Build/Compile/Py3Mod
cd $(PKG_BUILD_DIR)/$(strip $(1)), \ cd $(PKG_BUILD_DIR)/$(strip $(1)), \
./setup.py $(2), \ ./setup.py $(2), \
$(3)) $(3))
find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
endef endef
PYTHON3_PKG_SETUP_ARGS:=--single-version-externally-managed PYTHON3_PKG_SETUP_ARGS:=--single-version-externally-managed