X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fprereq.mk;h=23d5ded9b272b59e0c7700ed32ff4dd22b23dd22;hb=cc76e34c10e57cb1a4f7971268a77aad2f24c8ca;hp=9bc5e0dee232ba1242562866953d9ece7403c229;hpb=64c4ee703a16aea6917ec1aa7820edfce80f89a1;p=openwrt%2Fopenwrt.git

diff --git a/include/prereq.mk b/include/prereq.mk
index 9bc5e0dee2..23d5ded9b2 100644
--- a/include/prereq.mk
+++ b/include/prereq.mk
@@ -1,9 +1,6 @@
-# 
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# SPDX-License-Identifier: GPL-2.0-only
 #
+# Copyright (C) 2006-2020 OpenWrt.org
 
 ifneq ($(__prereq_inc),1)
 __prereq_inc:=1
@@ -62,10 +59,22 @@ define RequireHeader
   define Require/$(1)
     [ -e "$(1)" ]
   endef
-  
+
   $$(eval $$(call Require,$(1),$(2)))
 endef
 
+define CleanupPython2
+  define Require/python2-cleanup
+	if [ -f "$(STAGING_DIR_HOST)/bin/python" ] && \
+		$(STAGING_DIR_HOST)/bin/python -V 2>&1 | \
+		grep -q 'Python 2'; then \
+			rm $(STAGING_DIR_HOST)/bin/python; \
+	fi
+  endef
+
+  $$(eval $$(call Require,python2-cleanup))
+endef
+
 define QuoteHostCommand
 '$(subst ','"'"',$(strip $(1)))'
 endef
@@ -86,9 +95,12 @@ endef
 # 3+: candidates
 define SetupHostCommand
   define Require/$(1)
+	[ -f "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0; \
 	for cmd in $(call QuoteHostCommand,$(3)) $(call QuoteHostCommand,$(4)) \
 	           $(call QuoteHostCommand,$(5)) $(call QuoteHostCommand,$(6)) \
-	           $(call QuoteHostCommand,$(7)) $(call QuoteHostCommand,$(8)); do \
+	           $(call QuoteHostCommand,$(7)) $(call QuoteHostCommand,$(8)) \
+	           $(call QuoteHostCommand,$(9)) $(call QuoteHostCommand,$(10)) \
+	           $(call QuoteHostCommand,$(11)) $(call QuoteHostCommand,$(12)); do \
 		if [ -n "$$$$$$$$cmd" ]; then \
 			bin="$$$$$$$$(PATH="$(subst $(space),:,$(filter-out $(STAGING_DIR_HOST)/%,$(subst :,$(space),$(PATH))))" \
 				which "$$$$$$$${cmd%% *}")"; \