avoid rdep in the top level make process (subdir.mk) - it leaks too much memory and...

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

diff --git a/include/subdir.mk b/include/subdir.mk
index 217d6bc..0a3eff3 100644 (file)
--- a/include/subdir.mk
+++ b/include/subdir.mk
@@ -37,13 +37,9 @@ endef
 # Parameters: <subdir> <name> <target>
 define stampfile
   $(1)/stamp-$(3):=$(STAGING_DIR)/stamp/.$(2)_$(3)
 # Parameters: <subdir> <name> <target>
 define stampfile
   $(1)/stamp-$(3):=$(STAGING_DIR)/stamp/.$(2)_$(3)

-  $(if $(__rdep_$(1)),,
-    $(call rdep,$(1),$$($(1)/stamp-$(3)),)
-    __rdep_$(1):=1
-  )
-
-  $$($(1)/stamp-$(3)):
-       @+$(MAKE) $$($(1)/flags-$(3)) $(1)/$(3)
+  $$($(1)/stamp-$(3)): $(TMP_DIR)/.build
+       @+$(SCRIPT_DIR)/timestamp.pl -n $$($(1)/stamp-$(3)) $(1) || \
+               $(MAKE) $$($(1)/flags-$(3)) $(1)/$(3)

        @mkdir -p $$$$(dirname $$($(1)/stamp-$(3)))
        @touch $$($(1)/stamp-$(3))
 
        @mkdir -p $$$$(dirname $$($(1)/stamp-$(3)))
        @touch $$($(1)/stamp-$(3))
 

diff --git a/scripts/timestamp.pl b/scripts/timestamp.pl
index a4c5cae..89ec4e7 100755 (executable)
--- a/scripts/timestamp.pl
+++ b/scripts/timestamp.pl
@@ -39,6 +39,9 @@ while (@ARGV > 0) {
                $options{"findopts"} .= " -and -not -path \\*".$str."\\*"
        } elsif ($path =~ /^-f/) {
                $options{"findopts"} .= " -follow";
                $options{"findopts"} .= " -and -not -path \\*".$str."\\*"
        } elsif ($path =~ /^-f/) {
                $options{"findopts"} .= " -follow";

+       } elsif ($path =~ /^-n/) {
+               my $arg = $ARGV[0];
+               $options{$path} = $arg;

        } elsif ($path =~ /^-/) {
                $options{$path} = 1;
        } else {
        } elsif ($path =~ /^-/) {
                $options{$path} = 1;
        } else {


@@ -54,7 +57,9 @@ while (@ARGV > 0) {
        }
 }
 
        }
 }
 

-if ($options{"-p"}) {
+if ($options{"-n"}) {
+       exit ($n eq $options{"-n"} ? 0 : 1);
+} elsif ($options{"-p"}) {

        print "$n\n";
 } elsif ($options{"-t"}) {
        print "$ts\n";
        print "$n\n";
 } elsif ($options{"-t"}) {
        print "$ts\n";