author | clem <clem> | 2004-10-14 17:35:52 (UTC) |
---|---|---|
committer | clem <clem> | 2004-10-14 17:35:52 (UTC) |
commit | f8c4607b5fb51b071196020fbd3ca70012d9085a (patch) (unidiff) | |
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 @@ | |||
1 | #!/usr/bin/perl -w | 1 | #!/usr/bin/perl -w |
2 | 2 | ||
3 | use strict; | 3 | use strict; |
4 | 4 | ||
5 | my %depends; | 5 | my %depends; |
6 | my %tokenpath; | 6 | my %tokenpath; |
7 | 7 | ||
8 | sub getdepends ($$) | 8 | sub getdepends ($$) |
9 | { | 9 | { |
10 | my ($token, $path, $intoken); | 10 | my ($token, $path, $intoken); |
11 | $token = shift || return; | 11 | $token = shift || return; |
12 | $token =~ s/CONFIG_//; | 12 | $token =~ s/CONFIG_//; |
13 | $path = shift || return; | 13 | $path = shift || return; |
14 | #print "opening $path/config.in\n"; | 14 | #print "opening $path/config.in\n"; |
15 | #print "token is $token\n"; | 15 | #print "token is $token\n"; |
16 | open( FILE, "< $path/config.in" ) || return; | 16 | open( FILE, "< $path/config.in" ) || return; |
17 | $intoken = 0; | 17 | $intoken = 0; |
18 | while( <FILE> ) { | 18 | while( <FILE> ) { |
19 | if( $intoken == 1 ) { | 19 | if( $intoken == 1 ) { |
20 | /depends\S*(.*)/ && return $1; | 20 | /depends\S*(.*)/ && return $1; |
21 | if( /\S*(config|menu)/ ) { | 21 | if( /^\s*(config|menu)/ ) { |
22 | $intoken = 0; | 22 | $intoken = 0; |
23 | return; | 23 | return; |
24 | } | 24 | } |
25 | } else { | 25 | } else { |
26 | /$token/ || next; | 26 | /$token/ || next; |
27 | $intoken = 1; | 27 | $intoken = 1; |
28 | } | 28 | } |
29 | /$token/ || next; | 29 | /$token/ || next; |
30 | } | 30 | } |
31 | close( FILE ); | 31 | close( FILE ); |
32 | return; | 32 | return; |
33 | } | 33 | } |
34 | 34 | ||
35 | sub makedepends ($$) | 35 | sub makedepends ($$) |
36 | { | 36 | { |
37 | my ($depends, $tokenpath, $token, $depword, $mustbesep, $state); | 37 | my ($depends, $tokenpath, $token, $depword, $mustbesep, $state); |
38 | $depends = shift || return; | 38 | $depends = shift || return; |
39 | $tokenpath = shift || return; | 39 | $tokenpath = shift || return; |
40 | $mustbesep = 0; | 40 | $mustbesep = 0; |
41 | 41 | ||
42 | for $token (keys %$depends){ | 42 | for $token (keys %$depends){ |
43 | print ${$tokenpath}{$token} . " : "; | 43 | print ${$tokenpath}{$token} . " : "; |
44 | for (split(/\s+/, ${$depends}{$token})){ | 44 | for (split(/\s+/, ${$depends}{$token})){ |
45 | /^\s+$/ && next; | 45 | /^\s+$/ && next; |