diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2019-02-04 16:10:08 +0200 |
|---|---|---|
| committer | Alexandru Ardelean <ardeleanalex@gmail.com> | 2019-02-04 16:38:12 +0200 |
| commit | 14d0a9c58dc12c089c3d2209ebb1d9b37b68abad (patch) | |
| tree | 377c38eccc1b174c17d15ba39c579a98c33e9305 /lang/python | |
| parent | f5181d615c2f6361bf107314a786f7a0410526a2 (diff) | |
python,python3: move .exe removal in `python-package-install.sh` script
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>
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/python-package-install.sh | 2 | ||||
| -rw-r--r-- | lang/python/python-package.mk | 2 | ||||
| -rw-r--r-- | lang/python/python3-package.mk | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/lang/python/python-package-install.sh b/lang/python/python-package-install.sh index e5f6ec893..ae6f2ef77 100644 --- a/lang/python/python-package-install.sh +++ b/lang/python/python-package-install.sh @@ -47,6 +47,8 @@ python="$4" mode="$5" filespec="$6" +find "$src_dir" -name "*\.exe" | xargs rm -f + process_filespec "$src_dir" "$dst_dir" "$filespec" || { echo "process filespec error-ed" exit 1 diff --git a/lang/python/python-package.mk b/lang/python/python-package.mk index 66a492983..af35dcdb3 100644 --- a/lang/python/python-package.mk +++ b/lang/python/python-package.mk @@ -69,7 +69,6 @@ define PyPackage define Package/$(1)/install $(call PyPackage/$(1)/install,$$(1)) - find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f $(SHELL) $(python_mk_path)python-package-install.sh "2" \ "$(PKG_INSTALL_DIR)" "$$(1)" \ "$(HOST_PYTHON_BIN)" "$$(2)" \ @@ -113,7 +112,6 @@ define Build/Compile/PyMod cd $(PKG_BUILD_DIR)/$(strip $(1)), \ ./setup.py $(2), \ $(3)) - find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f endef PYTHON_PKG_SETUP_ARGS:=--single-version-externally-managed diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk index 9e473b5c5..9cfa7673e 100644 --- a/lang/python/python3-package.mk +++ b/lang/python/python3-package.mk @@ -68,7 +68,6 @@ define Py3Package define Package/$(1)/install $(call Py3Package/$(1)/install,$$(1)) - find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f $(SHELL) $(python3_mk_path)python-package-install.sh "3" \ "$(PKG_INSTALL_DIR)" "$$(1)" \ "$(HOST_PYTHON3_BIN)" "$$(2)" \ @@ -112,7 +111,6 @@ define Build/Compile/Py3Mod cd $(PKG_BUILD_DIR)/$(strip $(1)), \ ./setup.py $(2), \ $(3)) - find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f endef PYTHON3_PKG_SETUP_ARGS:=--single-version-externally-managed |