author | clem <clem> | 2004-10-14 17:35:52 (UTC) |
---|---|---|
committer | clem <clem> | 2004-10-14 17:35:52 (UTC) |
commit | f8c4607b5fb51b071196020fbd3ca70012d9085a (patch) (side-by-side diff) | |
tree | e41f8a6d290114aed1ff6cbc484f16da2980f80e | |
parent | fbcb3efe673fc6c956cbdae7cf6fb83a637dfc5e (diff) | |
download | opie-f8c4607b5fb51b071196020fbd3ca70012d9085a.zip opie-f8c4607b5fb51b071196020fbd3ca70012d9085a.tar.gz opie-f8c4607b5fb51b071196020fbd3ca70012d9085a.tar.bz2 |
fixed a bug where depends would be ignored for every package that had 'config' or 'menu' in its description! now noncore/settings/tabmanager, libopie2/opiecore, core/applets/lockapplet and noncore/settings/mediummount have correct depends, and make -j 10 won't choke on lockapplet or libopie2core being built before libqpe
-rwxr-xr-x | scripts/deps.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/deps.pl b/scripts/deps.pl index a219e36..21f816b 100755 --- a/scripts/deps.pl +++ b/scripts/deps.pl @@ -1,45 +1,45 @@ #!/usr/bin/perl -w use strict; my %depends; my %tokenpath; sub getdepends ($$) { my ($token, $path, $intoken); $token = shift || return; $token =~ s/CONFIG_//; $path = shift || return; #print "opening $path/config.in\n"; # print "token is $token\n"; open( FILE, "< $path/config.in" ) || return; $intoken = 0; while( <FILE> ) { if( $intoken == 1 ) { /depends\S*(.*)/ && return $1; - if( /\S*(config|menu)/ ) { + if( /^\s*(config|menu)/ ) { $intoken = 0; return; } } else { /$token/ || next; $intoken = 1; } /$token/ || next; } close( FILE ); return; } sub makedepends ($$) { my ($depends, $tokenpath, $token, $depword, $mustbesep, $state); $depends = shift || return; $tokenpath = shift || return; $mustbesep = 0; for $token (keys %$depends){ print ${$tokenpath}{$token} . " : "; for (split(/\s+/, ${$depends}{$token})){ /^\s+$/ && next; |