Skip to content
Snippets Groups Projects
Verified Commit 161cedfd authored by Karel Koci's avatar Karel Koci :metal:
Browse files

patches/packages: refresh python backport patch

parent 463f5baf
Branches
Tags
No related merge requests found
From 925c5df30c3ca117dc1c6fd90589ede59a40c16a Mon Sep 17 00:00:00 2001
From 1e0368d74b445c55e094479c69298c7e55a42d42 Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Mon, 18 Feb 2019 16:23:45 +0800
Subject: [PATCH 1/2] python,python3: Fix calling default PyPackage/install
Subject: [PATCH] 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
......@@ -15,7 +15,7 @@ Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lang/python/python-package.mk b/lang/python/python-package.mk
index 66a492983..648c6ee68 100644
index 855dd44..dc5d020 100644
--- a/lang/python/python-package.mk
+++ b/lang/python/python-package.mk
@@ -68,7 +68,7 @@ define PyPackage
......@@ -25,10 +25,10 @@ index 66a492983..648c6ee68 100644
- $(call PyPackage/$(1)/install,$$(1))
+ $$(call PyPackage/$(1)/install,$$(1))
find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
SED="$(SED)" \
$(SHELL) $(python_mk_path)python-package-install.sh "2" \
"$(PKG_INSTALL_DIR)" "$$(1)" \
diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk
index 9e473b5c5..a84880dff 100644
index 5a779c2..8bdac65 100644
--- a/lang/python/python3-package.mk
+++ b/lang/python/python3-package.mk
@@ -67,7 +67,7 @@ define Py3Package
......@@ -38,8 +38,8 @@ index 9e473b5c5..a84880dff 100644
- $(call Py3Package/$(1)/install,$$(1))
+ $$(call Py3Package/$(1)/install,$$(1))
find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
SED="$(SED)" \
$(SHELL) $(python3_mk_path)python-package-install.sh "3" \
"$(PKG_INSTALL_DIR)" "$$(1)" \
--
2.21.0
2.22.1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment