1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 22:11:33 +02:00

[backfire] merge r22946

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22969 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-09-07 21:10:43 +00:00
parent 4830dd1a9f
commit adec15d842

View File

@ -665,14 +665,15 @@ sub gen_package_mk() {
$dep = $1; $dep = $1;
$suffix = $2; $suffix = $2;
} }
my $pkg_dep = $package{$dep};
next unless $pkg_dep;
my $idx = ""; 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}; $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
} elsif (defined($srcpackage{$dep})) { } elsif (defined($srcpackage{$dep})) {
$idx = $subdir{$dep}.$dep; $idx = $subdir{$dep}.$dep;
} else {
next;
} }
my $depstr = "\$(curdir)/$idx$suffix/compile"; my $depstr = "\$(curdir)/$idx$suffix/compile";
my $depline = get_conditional_dep($condition, $depstr); my $depline = get_conditional_dep($condition, $depstr);