qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-12 00:03:44 +02:00
Code

fix some previously ignored build dependencies (for example, uci->lua)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11429 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2008-06-11 01:36:08 +00:00
parent 59f2b19172
commit e6074d0ad7
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/metadata.pl
View File

@ -502,11 +502,21 @@ sub gen_package_mk() {
foreach my $name (sort {uc($a) cmp uc($b)} keys %package) { foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
my $config; my $config;
my $pkg = $package{$name}; my $pkg = $package{$name};
my @srcdeps;
next if defined $pkg->{vdepends}; next if defined $pkg->{vdepends};
next if $done{$pkg->{src}}; next if $done{$pkg->{src}};
$done{$pkg->{src}} = 1; $done{$pkg->{src}} = 1;
foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
$dep =~ /@/ or do {
$dep =~ s/\+//g;
push @srcdeps, $dep;
};
}
}
if ($ENV{SDK}) { if ($ENV{SDK}) {
$conf{$pkg->{src}} or do { $conf{$pkg->{src}} or do {
$config = 'm'; $config = 'm';
@ -522,9 +532,7 @@ sub gen_package_mk() {
my $hasdeps = 0; my $hasdeps = 0;
my $depline = ""; my $depline = "";
foreach my $deps (@{$pkg->{depends}}, @{$pkg->{builddepends}}) { foreach my $deps (@srcdeps) {
next if $deps =~ /@/;
$deps =~ s/\+//;
my $idx; my $idx;
my $pkg_dep = $package{$deps}; my $pkg_dep = $package{$deps};
my @deps; my @deps;
@ -544,10 +552,12 @@ sub gen_package_mk() {
} }
undef $idx if $idx =~ /^(kernel)|(base-files)$/; undef $idx if $idx =~ /^(kernel)|(base-files)$/;
if ($idx) { if ($idx) {
next if $dep{$pkg->{src}."->".$idx};
next if $pkg->{src} eq $pkg_dep->{src}; next if $pkg->{src} eq $pkg_dep->{src};
next if $dep{$pkg->{src}."->".$idx};
next if $dep{$pkg->{src}."->($dep)".$idx};
if ($pkg_dep->{vdepends}) { if ($pkg_dep->{vdepends}) {
$depline .= " \$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)"; $depline .= " \$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
$dep{$pkg->{src}."->($dep)".$idx} = 1;
} else { } else {
$depline .= " \$(curdir)/$idx/compile"; $depline .= " \$(curdir)/$idx/compile";
$dep{$pkg->{src}."->".$idx} = 1; $dep{$pkg->{src}."->".$idx} = 1;