summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-06 01:43:20 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-06 01:43:20 +0000
commitfc1ff6d3ea22069114fa4e249ca56ee52ec14ac4 (patch)
tree23507ad11c0940ecdb507c69f2d9e6cf8d7528c1
parent8e3dbe3870d77e98309852ab340aa3ccb9aed845 (diff)
[scripts] metadata.pl: fix handling of HOST_BUILD_DEPENDS if a package is referenced that only exists as source pkg, e.g. libtool
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22946 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xscripts/metadata.pl7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index a9242d0a7..336605f7b 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -667,14 +667,15 @@ sub gen_package_mk() {
$dep = $1;
$suffix = $2;
}
- my $pkg_dep = $package{$dep};
- next unless $pkg_dep;
my $idx = "";
- if (defined $pkg_dep->{src}) {
+ my $pkg_dep = $package{$dep};
+ if (defined($pkg_dep) && defined($pkg_dep->{src})) {
$idx = $pkg_dep->{subdir}.$pkg_dep->{src};
} elsif (defined($srcpackage{$dep})) {
$idx = $subdir{$dep}.$dep;
+ } else {
+ next;
}
my $depstr = "\$(curdir)/$idx$suffix/compile";
my $depline = get_conditional_dep($condition, $depstr);