fix host dependencies for packages that depend on their own host build
SVN-Revision: 14952
This commit is contained in:
parent
e63207019d
commit
08b7cbe44e
@ -676,23 +676,24 @@ sub gen_package_mk() {
|
|||||||
foreach my $dep (@deps) {
|
foreach my $dep (@deps) {
|
||||||
$pkg_dep = $package{$deps};
|
$pkg_dep = $package{$deps};
|
||||||
if (defined $pkg_dep->{src}) {
|
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})) {
|
} elsif (defined($srcpackage{$dep})) {
|
||||||
$idx = $subdir{$dep}.$dep;
|
$idx = $subdir{$dep}.$dep;
|
||||||
}
|
}
|
||||||
|
$idx .= $suffix;
|
||||||
undef $idx if $idx =~ /^(kernel)|(base-files)$/;
|
undef $idx if $idx =~ /^(kernel)|(base-files)$/;
|
||||||
if ($idx) {
|
if ($idx) {
|
||||||
my $depline;
|
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}."->".$idx};
|
||||||
next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends};
|
next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends};
|
||||||
my $depstr;
|
my $depstr;
|
||||||
|
|
||||||
if ($pkg_dep->{vdepends}) {
|
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;
|
$dep{$pkg->{src}."->($dep)".$idx} = 1;
|
||||||
} else {
|
} else {
|
||||||
$depstr = "\$(curdir)/$idx$suffix/compile";
|
$depstr = "\$(curdir)/$idx/compile";
|
||||||
$dep{$pkg->{src}."->".$idx} = 1;
|
$dep{$pkg->{src}."->".$idx} = 1;
|
||||||
}
|
}
|
||||||
$depline = get_conditional_dep($condition, $depstr);
|
$depline = get_conditional_dep($condition, $depstr);
|
||||||
|
Loading…
Reference in New Issue
Block a user