summaryrefslogtreecommitdiffstats
path: root/scripts/metadata.pl
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-20 20:17:28 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-20 20:17:28 +0000
commitd5481bac44b2b1be6e8fdbb98634edd62d7e3ea5 (patch)
tree2a9d10c214cbc2beabba48cb3d7f4f5214861398 /scripts/metadata.pl
parentcc6d0c4ff9f38906580c05802f661d69192f2eb6 (diff)
fix build dependencies on packages with multiple variants but no selected virtual packages
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23102 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts/metadata.pl')
-rwxr-xr-xscripts/metadata.pl3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 2e9025727..45d202e43 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -640,6 +640,9 @@ sub gen_package_mk() {
$pkg->{buildonly} and $config = "";
print "package-$config += $pkg->{subdir}$pkg->{src}\n";
if ($pkg->{variant}) {
+ if (!defined($done{$pkg->{src}})) {
+ print "\$(curdir)/$pkg->{subdir}$pkg->{src}/default-variant := $pkg->{variant}\n";
+ }
print "\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if $config,$pkg->{variant})\n"
}
$pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";