mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

speed up package prereq check (only run make on those directories that actually contain prereq checks)

Browse Source 
SVN-Revision: 4927
This commit is contained in:
Felix Fietkau 2006-10-05 12:39:52 +00:00
parent d658a1d68a
commit ca531442af
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openwrt/include/package.mk
View File

@ -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; \

1
openwrt/include/prereq.mk
View File

@ -22,6 +22,7 @@ prereq:
.SILENT: $(TMP_DIR) prereq
define Require
export PREREQ_CHECK=1
ifeq ($$(CHECK_$(1)),)
prereq: prereq-$(1)

2
openwrt/package/Makefile
View File

@ -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))

8
openwrt/scripts/gen_deps.pl
View File

@ -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";
}