aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-03-20 12:47:13 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-03-20 12:47:13 +0000
commit08b7cbe44e178861cc6bbc11c83272363ae645e6 (patch)
tree97b34c3ffa8a5a045cac9a171669462cbbebe5a3
parente63207019d01e115e7ebd145313fbc07d173e639 (diff)
downloadupstream-08b7cbe44e178861cc6bbc11c83272363ae645e6.tar.gz
upstream-08b7cbe44e178861cc6bbc11c83272363ae645e6.tar.bz2
upstream-08b7cbe44e178861cc6bbc11c83272363ae645e6.zip
fix host dependencies for packages that depend on their own host build
SVN-Revision: 14952
-rwxr-xr-xscripts/metadata.pl9
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index c341e65261..1c80be4bdb 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -676,23 +676,24 @@ sub gen_package_mk() {
foreach my $dep (@deps) {
$pkg_dep = $package{$deps};
if (defined $pkg_dep->{src}) {
- ($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
+ ($pkg->{src} ne $pkg_dep->{src}.$suffix) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
} elsif (defined($srcpackage{$dep})) {
$idx = $subdir{$dep}.$dep;
}
+ $idx .= $suffix;
undef $idx if $idx =~ /^(kernel)|(base-files)$/;
if ($idx) {
my $depline;
- next if $pkg->{src} eq $pkg_dep->{src};
+ next if $pkg->{src} eq $pkg_dep->{src}.$suffix;
next if $dep{$pkg->{src}."->".$idx};
next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends};
my $depstr;
if ($pkg_dep->{vdepends}) {
- $depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx$suffix/compile)";
+ $depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
$dep{$pkg->{src}."->($dep)".$idx} = 1;
} else {
- $depstr = "\$(curdir)/$idx$suffix/compile";
+ $depstr = "\$(curdir)/$idx/compile";
$dep{$pkg->{src}."->".$idx} = 1;
}
$depline = get_conditional_dep($condition, $depstr);