summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-10-01 21:26:19 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-10-01 21:26:19 +0000
commit7e8f0bc28dcf77eb881b9455332da32027f2b228 (patch)
tree75fdd57d9c5cc5a021ec017a762801c997ca6154 /scripts
parentfe71fc77ef564770fbe8dc665fddef72e14f2395 (diff)
implement conditional dependencies for menuconfig and build deps
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12820 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/feeds1
-rwxr-xr-xscripts/metadata.pl25
2 files changed, 24 insertions, 2 deletions
diff --git a/scripts/feeds b/scripts/feeds
index ab765b1ea..8ec0799f7 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -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;
}
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index bee302012..e05cc92c4 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -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";
+ }
}
}
}