ar7: backport small fixes from linux-mips

[openwrt.git] / include / prereq.mk

diff --git a/include/prereq.mk b/include/prereq.mk
index e514855..4a55c89 100644 (file)
--- a/include/prereq.mk
+++ b/include/prereq.mk
@@ -1,39 +1,37 @@
 # 
 # 

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2007 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 #
 # 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:
 
 prereq:

-       echo

        if [ -f $(TMP_DIR)/.prereq-error ]; then \
        if [ -f $(TMP_DIR)/.prereq-error ]; then \

+               echo; \

                cat $(TMP_DIR)/.prereq-error; \
                cat $(TMP_DIR)/.prereq-error; \

+               rm -f $(TMP_DIR)/.prereq-error; \

                echo; \
                echo; \

-               rm -rf $(TMP_DIR); \

                false; \
        fi
                false; \
        fi

-       rm -rf $(TMP_DIR)
-       mkdir -p $(TMP_DIR)

 
 

-.SILENT: $(TMP_DIR) prereq
+.SILENT: prereq
+endif

 
 define Require
 
 define Require

+  export PREREQ_CHECK=1

   ifeq ($$(CHECK_$(1)),)
     prereq: prereq-$(1)
 
   ifeq ($$(CHECK_$(1)),)
     prereq: prereq-$(1)
 

-    prereq-$(1): $(TMP_DIR) FORCE
+    prereq-$(1): FORCE

                echo -n "Checking '$(1)'... "
                echo -n "Checking '$(1)'... "

-               if $(NO_TRACE_MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \
+               if $(NO_TRACE_MAKE) -f $(firstword $(MAKEFILE_LIST)) check-$(1) >/dev/null 2>/dev/null; then \

                        echo 'ok.'; \
                else \
                        echo 'failed.'; \
                        echo 'ok.'; \
                else \
                        echo 'failed.'; \

-                       echo -e "$(strip $(2))" >> $(TMP_DIR)/.prereq-error; \
+                       echo -e "$(PKG_NAME): $(strip $(2))" | perl -ne 's/\\\s*/\n/g,print' >> $(TMP_DIR)/.prereq-error; \

                fi
 
     check-$(1): FORCE
                fi
 
     check-$(1): FORCE


@@ -53,81 +51,12 @@ define RequireCommand
   $$(eval $$(call Require,$(1),$(2)))
 endef
 
   $$(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 (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++ -
-endef
-
-$(eval $(call Require,working-g++, \
-       No working GNU C++ Compiler (g++) was found on your system. \
-))
-
-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 -
-endef
-
-$(eval $(call Require,ncurses, \
-       No ncurses development files were not found on your system. \
-))
-
-
-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 -
+define RequireHeader
+  define Require/$(1)
+    [ -e "$(1)" ]
+  endef
+  
+  $$(eval $$(call Require,$(1),$(2)))

 endef
 
 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. \
-))
+.NOTPARALLEL: