KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

avoid rdep in the top level make process (subdir.mk) - it leaks too much memory and increases the startup time for regular make commands. timestamp.pl is more lightweight here

Browse source 
SVN-Revision: 8533
This commit is contained in:
Felix Fietkau 2007-08-29 03:51:49 +00:00
parent ec70a7a19f
commit d475d94aab
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/subdir.mk
View file

@ -37,13 +37,9 @@ endef
# Parameters: <subdir> <name> <target> # Parameters: <subdir> <name> <target>
define stampfile define stampfile
$(1)/stamp-$(3):=$(STAGING_DIR)/stamp/.$(2)_$(3) $(1)/stamp-$(3):=$(STAGING_DIR)/stamp/.$(2)_$(3)
$(if $(__rdep_$(1)),, $$($(1)/stamp-$(3)): $(TMP_DIR)/.build
$(call rdep,$(1),$$($(1)/stamp-$(3)),) @+$(SCRIPT_DIR)/timestamp.pl -n $$($(1)/stamp-$(3)) $(1) || \
__rdep_$(1):=1 $(MAKE) $$($(1)/flags-$(3)) $(1)/$(3)
)
$$($(1)/stamp-$(3)):
@+$(MAKE) $$($(1)/flags-$(3)) $(1)/$(3)
@mkdir -p $$$$(dirname $$($(1)/stamp-$(3))) @mkdir -p $$$$(dirname $$($(1)/stamp-$(3)))
@touch $$($(1)/stamp-$(3)) @touch $$($(1)/stamp-$(3))

7
scripts/timestamp.pl
View file

@ -39,6 +39,9 @@ while (@ARGV > 0) {
$options{"findopts"} .= " -and -not -path \\*".$str."\\*" $options{"findopts"} .= " -and -not -path \\*".$str."\\*"
} elsif ($path =~ /^-f/) { } elsif ($path =~ /^-f/) {
$options{"findopts"} .= " -follow"; $options{"findopts"} .= " -follow";
} elsif ($path =~ /^-n/) {
my $arg = $ARGV[0];
$options{$path} = $arg;
} elsif ($path =~ /^-/) { } elsif ($path =~ /^-/) {
$options{$path} = 1; $options{$path} = 1;
} else { } 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"; print "$n\n";
} elsif ($options{"-t"}) { } elsif ($options{"-t"}) {
print "$ts\n"; print "$ts\n";