diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-05 12:39:52 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-05 12:39:52 +0000 |
| commit | cf807efd13ca47672871d0c50d23274fe34c3114 (patch) | |
| tree | 6b03cb6970fc37cbfc9c1431cb3e05bba369533a | |
| parent | 2347229ddd150b425c9617dabfe6ae7e2bcc53eb (diff) | |
speed up package prereq check (only run make on those directories that actually contain prereq checks)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4927 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package.mk | 3 | ||||
| -rw-r--r-- | include/prereq.mk | 1 | ||||
| -rw-r--r-- | package/Makefile | 2 | ||||
| -rwxr-xr-x | scripts/gen_deps.pl | 8 |
4 files changed, 11 insertions, 3 deletions
diff --git a/include/package.mk b/include/package.mk index 709bb4415..3f2f7d41b 100644 --- a/include/package.mk +++ b/include/package.mk @@ -163,13 +163,14 @@ define BuildPackage endif DUMPINFO += \ + if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \ echo "Version: $(VERSION)"; \ echo "Depends: $$(IDEPEND_$(1))"; \ echo "Build-Depends: $(PKG_BUILDDEP)"; \ echo "Category: $(CATEGORY)"; \ echo "Title: $(TITLE)"; \ echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; - + ifneq ($(URL),) DUMPINFO += \ echo; \ diff --git a/include/prereq.mk b/include/prereq.mk index c9b82d294..eda7ca35a 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -22,6 +22,7 @@ prereq: .SILENT: $(TMP_DIR) prereq define Require + export PREREQ_CHECK=1 ifeq ($$(CHECK_$(1)),) prereq: prereq-$(1) diff --git a/package/Makefile b/package/Makefile index b9392c049..b6165b856 100644 --- a/package/Makefile +++ b/package/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/.config include $(TOPDIR)/.pkgdeps -PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(package-y) $(package-m)) +PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(package-prereq)) DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m)) COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m)) INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y)) diff --git a/scripts/gen_deps.pl b/scripts/gen_deps.pl index 70c07b70a..e7daf1886 100755 --- a/scripts/gen_deps.pl +++ b/scripts/gen_deps.pl @@ -13,6 +13,8 @@ my $src; my $makefile; my %conf; my %pkg; +my %prereq; +my $prereq; my %dep; my %options; my $opt; @@ -33,6 +35,10 @@ while ($line = <>) { defined $pkg{$name} or $pkg{$name} = {}; $pkg{$name}->{src} = $src; }; + $line =~ /^Prereq-Check:/ and !defined $prereq{$src} and do { + $prereq{$src} = 1; + $prereq .= "package-prereq += $src\n"; + }; $line =~ /^(Build-)?Depends: \s*(.+)\s*$/ and do { $pkg{$name}->{depends} ||= []; foreach my $v (split /\s+/, $2) { @@ -75,5 +81,5 @@ foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) { } if ($line ne "") { - print "\n$line"; + print "\n$line\n$prereq"; } |