fix shell escaping bug in append() function

[openwrt.git] / include / prereq.mk

diff --git a/include/prereq.mk b/include/prereq.mk
index c51953b..eda7ca3 100644 (file)
--- a/include/prereq.mk
+++ b/include/prereq.mk
@@ -5,30 +5,30 @@
 # See /LICENSE for more information.
 #
 
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/verbose.mk
-
 $(TMP_DIR):
        mkdir -p $@
 
 prereq:
-       @echo
-       @if [ -f $(TMP_DIR)/.prereq-error ]; then \
+       if [ -f $(TMP_DIR)/.prereq-error ]; then \
+               echo; \
                cat $(TMP_DIR)/.prereq-error; \
                echo; \
                rm -rf $(TMP_DIR); \
                false; \
        fi
-       @rm -rf $(TMP_DIR)
-       @mkdir -p $(TMP_DIR)
+       rm -rf $(TMP_DIR)
+       mkdir -p $(TMP_DIR)
+
+.SILENT: $(TMP_DIR) prereq
 
 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 \
+               echo -n "Checking '$(1)'... "
+               if $(NO_TRACE_MAKE) -f $(firstword $(MAKEFILE_LIST)) check-$(1) >/dev/null 2>/dev/null; then \
                        echo 'ok.'; \
                else \
                        echo 'failed.'; \
@@ -38,6 +38,8 @@ define Require
     check-$(1): FORCE
          $(call Require/$(1))
     CHECK_$(1):=1
+
+    .SILENT: prereq-$(1) check-$(1)
   endif
 endef
 
@@ -50,69 +52,3 @@ 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 Require/working-gcc
-       echo 'int main(int argc, char **argv) { return 0; }' | \
-               gcc -x c -o $(TMP_DIR)/a.out -
-endef
-
-$(eval $(call Require,working-gcc, \
-       No working GNU C Compiler 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++ -
-endef
-
-$(eval $(call Require,working-g++, \
-       No working GNU C++ Compiler was found on your system. \
-))
-
-define Require/zlib
-       echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \
-               gcc -x c -o $(TMP_DIR)/a.out -lz -
-endef
-
-$(eval $(call Require,zlib, \
-       The development version of zlib was 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. \
-))
-
-