X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=include%2Fprereq.mk;h=6cb590e360aab351b567e8b76dfa35a98815d4af;hp=e514855a67fdf3177a583270a22f97934097dce8;hb=bcec32cd1e204f4af6b3cc9209a243001c85b6cc;hpb=27335d91b487bca2a004f3541bbe402ba3f68faf

diff --git a/include/prereq.mk b/include/prereq.mk
index e514855a67..6cb590e360 100644
--- a/include/prereq.mk
+++ b/include/prereq.mk
@@ -1,39 +1,41 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
-include $(TOPDIR)/rules.mk
-
-$(TMP_DIR):
-	mkdir -p $@
+ifneq ($(__prereq_inc),1)
+__prereq_inc:=1
 
 prereq:
-	echo
 	if [ -f $(TMP_DIR)/.prereq-error ]; then \
+		echo; \
 		cat $(TMP_DIR)/.prereq-error; \
+		rm -f $(TMP_DIR)/.prereq-error; \
 		echo; \
-		rm -rf $(TMP_DIR); \
 		false; \
 	fi
-	rm -rf $(TMP_DIR)
-	mkdir -p $(TMP_DIR)
 
-.SILENT: $(TMP_DIR) prereq
+.SILENT: prereq
+endif
+
+PREREQ_PREV=
 
+# 1: display name
+# 2: error message
 define Require
+  export PREREQ_CHECK=1
   ifeq ($$(CHECK_$(1)),)
     prereq: prereq-$(1)
 
-    prereq-$(1): $(TMP_DIR) FORCE
-		echo -n "Checking '$(1)'... "
-		if $(NO_TRACE_MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \
+    prereq-$(1): $(if $(PREREQ_PREV),prereq-$(PREREQ_PREV)) FORCE
+		printf "Checking '$(1)'... "
+		if $(NO_TRACE_MAKE) -f $(firstword $(MAKEFILE_LIST)) check-$(1) >/dev/null 2>/dev/null; then \
 			echo 'ok.'; \
 		else \
 			echo 'failed.'; \
-			echo -e "$(strip $(2))" >> $(TMP_DIR)/.prereq-error; \
+			echo "$(PKG_NAME): $(strip $(2))" >> $(TMP_DIR)/.prereq-error; \
 		fi
 
     check-$(1): FORCE
@@ -41,7 +43,10 @@ define Require
     CHECK_$(1):=1
 
     .SILENT: prereq-$(1) check-$(1)
+    .NOTPARALLEL:
   endif
+
+  PREREQ_PREV=$(1)
 endef
 
 
@@ -53,81 +58,51 @@ define RequireCommand
   $$(eval $$(call Require,$(1),$(2)))
 endef
 
-# Required for the toolchain
-define Require/working-make
-	echo 'all: test' > $(TMP_DIR)/check.mk
-	echo 'e0 = $$$$(foreach s,foobar,$$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk
-	echo 'e1 = $$$$(foreach s,foobar, $$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk
-	echo 'test: $$$$(strip $$$$(e0)) $$$$(strip $$$$(e1))' >> $(TMP_DIR)/check.mk
-	$(NO_TRACE_MAKE) -f $(TMP_DIR)/check.mk
-endef
-
-$(eval $(call Require,working-make, \
-	Your make version is buggy. Please install GNU make v3.81 or later. \
-))
+define RequireHeader
+  define Require/$(1)
+    [ -e "$(1)" ]
+  endef
 
-define Require/working-gcc
-	echo 'int main(int argc, char **argv) { return 0; }' | \
-		gcc -x c -o $(TMP_DIR)/a.out -
+  $$(eval $$(call Require,$(1),$(2)))
 endef
 
-$(eval $(call Require,working-gcc, \
-	No working GNU C Compiler (gcc) was found on your system. \
-))
-
-define Require/working-g++
-	echo 'int main(int argc, char **argv) { return 0; }' | \
-		g++ -x c++ -o $(TMP_DIR)/a.out -lstdc++ -
+define QuoteHostCommand
+'$(subst ','"'"',$(strip $(1)))'
 endef
 
-$(eval $(call Require,working-g++, \
-	No working GNU C++ Compiler (g++) was found on your system. \
-))
+# 1: display name
+# 2: failure message
+# 3: test
+define TestHostCommand
+  define Require/$(1)
+	($(3)) >/dev/null 2>/dev/null
+  endef
 
-define Require/ncurses
-	echo 'int main(int argc, char **argv) { initscr(); return 0; }' | \
-		gcc -include ncurses.h -x c -o $(TMP_DIR)/a.out -lncurses -
+  $$(eval $$(call Require,$(1),$(2)))
 endef
 
-$(eval $(call Require,ncurses, \
-	No ncurses development files were not found on your system. \
-))
-
+# 1: canonical name
+# 2: failure message
+# 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)) \
+			   $(call QuoteHostCommand,$(9)); do \
+		if [ -n "$$$$$$$$cmd" ]; then \
+			bin="$$$$$$$$(PATH="$(subst $(space),:,$(filter-out $(STAGING_DIR_HOST)/%,$(subst :,$(space),$(PATH))))" \
+				which "$$$$$$$${cmd%% *}")"; \
+			if [ -x "$$$$$$$$bin" ] && eval "$$$$$$$$cmd" >/dev/null 2>/dev/null; then \
+				mkdir -p "$(STAGING_DIR_HOST)/bin"; \
+				ln -sf "$$$$$$$$bin" "$(STAGING_DIR_HOST)/bin/$(strip $(1))"; \
+				exit 0; \
+			fi; \
+		fi; \
+	done; \
+	exit 1
+  endef
 
-define Require/zlib
-	echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \
-		gcc -include zlib.h -x c -o $(TMP_DIR)/a.out -lz -
+  $$(eval $$(call Require,$(1),$(if $(2),$(2),Missing $(1) command)))
 endef
-
-$(eval $(call Require,zlib, \
-	No zlib development files were not found on your system. \
-))
-
-
-$(eval $(call RequireCommand,bison, \
-	Please install GNU bison. \
-))
-
-$(eval $(call RequireCommand,flex, \
-	Please install flex. \
-))
-
-$(eval $(call RequireCommand,python, \
-	Please install python. \
-))
-
-$(eval $(call RequireCommand,unzip, \
-	Please install unzip. \
-))
-
-$(eval $(call RequireCommand,bzip2, \
-	Please install bzip2. \
-))
-
-$(eval $(call RequireCommand,patch, \
-	Please install patch. \
-))
-
-$(eval $(call RequireCommand,perl, \
-	Please install perl. \
-))