qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

implement conditional dependencies for menuconfig and build deps

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12820 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2008-10-01 21:26:19 +00:00
parent fe71fc77ef
commit 7e8f0bc28d
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/feeds
View File

@@ -290,6 +290,7 @@ sub install_package {
foreach my $vpkg (@{$srcpackage{$src}}, $pkg) {
foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
next if $dep =~ /@/;
next if $dep =~ /:/;
$dep =~ s/^\+//;
install_package($feed, $dep) == 0 or $ret = 1;
}

25
scripts/metadata.pl
View File

@@ -223,6 +223,7 @@ EOF
$flags = $1;
$name = $2;
next if $name =~ /:/;
$flags =~ /-/ and $mode = "deselect";
$flags =~ /\+/ and $mode = "select";
$flags =~ /@/ and $confstr .= "\t$mode $name\n";
@@ -374,8 +375,13 @@ sub mconf_depends($$) {
my $m = "depends";
$depend =~ s/^([@\+]+)//;
my $flags = $1;
my $condition;
my $vdep;
if ($depend =~ /^(.+):(.+)$/) {
$condition = $1;
$depend = $2;
}
if ($vdep = $package{$depend}->{vdepends}) {
$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
} else {
@@ -390,6 +396,7 @@ sub mconf_depends($$) {
next if $only_dep;
};
$flags =~ /@/ or $depend = "PACKAGE_$depend";
$condition and $depend = "$depend if $condition";
}
$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
}
@@ -535,6 +542,13 @@ sub gen_package_mk() {
my $depline = "";
foreach my $deps (@srcdeps) {
my $idx;
my $condition;
if ($deps =~ /^(.+):(.+)/) {
$condition = $1;
$deps = $2;
}
my $pkg_dep = $package{$deps};
my @deps;
@@ -556,13 +570,20 @@ sub gen_package_mk() {
next if $pkg->{src} eq $pkg_dep->{src};
next if $dep{$pkg->{src}."->".$idx};
next if $dep{$pkg->{src}."->($dep)".$idx};
my $depstr;
if ($pkg_dep->{vdepends}) {
$depline .= " \$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
$depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
$dep{$pkg->{src}."->($dep)".$idx} = 1;
} else {
$depline .= " \$(curdir)/$idx/compile";
$depstr = "\$(curdir)/$idx/compile";
$dep{$pkg->{src}."->".$idx} = 1;
}
if ($condition) {
$depline .= " \$(if \$(CONFIG_$condition),$depstr)";
} else {
$depline .= " $depstr";
}
}
}
}