From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 24 Nov 2010 14:07:12 +0000 (+0000)
Subject: change the recursive dependency template to use more make evaluation - the shell... 
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=f7ff90366de0f9ebd0e69914703488ef17219072;hp=d6a66721901800c640c3b842390969d398e8935d;p=openwrt.git

change the recursive dependency template to use more make evaluation - the shell command got so long that it triggered "Argument list too long" on some systems (#8231)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24131 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/include/depends.mk b/include/depends.mk
index 042fd4f4f2..14cdcdf7a7 100644
--- a/include/depends.mk
+++ b/include/depends.mk
@@ -20,28 +20,29 @@ define rdep
   .SILENT: $(2)_check
 
   $(2): $(2)_check
+
+ifneq ($(wildcard $(2)),)
+  $(2)_check::
+	$(if $(3), \
+		$(call find_md5,$(1),$(4)) > $(3).1; \
+		{ [ \! -f "$(3)" ] || diff $(3) $(3).1 >/dev/null; } && \
+	) \
+	{ \
+		[ -f "$(2)_check.1" ] && mv "$(2)_check.1"; \
+	    $(TOPDIR)/scripts/timestamp.pl $(DEP_FINDPARAMS) $(4) -n $(2) $(1) && { \
+			$(call debug_eval,$(SUBDIR),r,echo "No need to rebuild $(2)";) \
+			touch -r "$(2)" "$(2)_check"; \
+		} \
+	} || { \
+		$(call debug_eval,$(SUBDIR),r,echo "Need to rebuild $(2)";) \
+		touch "$(2)_check"; \
+	}
+	$(if $(3), mv $(3).1 $(3))
+else
   $(2)_check::
-	if [ -f "$(2)" ]; then \
-		$(if $(3), \
-			$(call find_md5,$(1),$(4)) > $(3).1; \
-			{ [ \! -f "$(3)" ] || diff $(3) $(3).1 >/dev/null; } && \
-		) \
-		{ \
-			[ -f "$(2)_check.1" ] && mv "$(2)_check.1"; \
-		    $(TOPDIR)/scripts/timestamp.pl $(DEP_FINDPARAMS) $(4) -n $(2) $(1) && { \
-				$(call debug_eval,$(SUBDIR),r,echo "No need to rebuild $(2)";) \
-				touch -r "$(2)" "$(2)_check"; \
-			} \
-		} || { \
-			$(call debug_eval,$(SUBDIR),r,echo "Need to rebuild $(2)";) \
-			touch "$(2)_check"; \
-		}; \
-		$(if $(3), mv $(3).1 $(3);) \
-	else \
-		$(if $(3), rm -f $(3) $(3).1;) \
-		$(call debug_eval,$(SUBDIR),r,echo "Target $(2) not built";) \
-		true; \
-	fi
+	$(if $(3), rm -f $(3) $(3).1)
+	$(call debug_eval,$(SUBDIR),r,echo "Target $(2) not built")
+endif
 
 endef