aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-05-30 17:09:21 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-05-30 17:09:21 +0000
commitbd6b6a84e79481192a5f0ee150df2a12656746d4 (patch)
tree840ed863b031714b1fb2394fe276a92ef99fcac6 /scripts
parent9140bea028fa72b8faec8cbd7bd238359889b217 (diff)
downloadupstream-bd6b6a84e79481192a5f0ee150df2a12656746d4.tar.gz
upstream-bd6b6a84e79481192a5f0ee150df2a12656746d4.tar.bz2
upstream-bd6b6a84e79481192a5f0ee150df2a12656746d4.zip
add proper build depends
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3841 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/gen_deps.pl4
-rwxr-xr-xscripts/gen_menuconfig.pl7
2 files changed, 2 insertions, 9 deletions
diff --git a/scripts/gen_deps.pl b/scripts/gen_deps.pl
index ef49fa3f41..40153bde3d 100755
--- a/scripts/gen_deps.pl
+++ b/scripts/gen_deps.pl
@@ -18,8 +18,8 @@ while ($line = <>) {
defined $pkg{$name} or $pkg{$name} = {};
$pkg{$name}->{src} = $src;
};
- $line =~ /^Depends: \s*(.+)\s*$/ and do {
- my @dep = split /,\s*/, $1;
+ $line =~ /^(Build-)?Depends: \s*(.+)\s*$/ and do {
+ my @dep = split /,\s*/, $2;
$pkg{$name}->{depends} = \@dep;
};
}
diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl
index e304f18813..e282ee3ed2 100755
--- a/scripts/gen_menuconfig.pl
+++ b/scripts/gen_menuconfig.pl
@@ -28,9 +28,6 @@ sub print_category($) {
foreach my $depend (@{$pkg->{depends}}) {
print "\t\tdepends PACKAGE_$depend\n";
}
- foreach my $need (@{$pkg->{needs}}) {
- print "\t\tselect PACKAGE_$need\n";
- }
print "\t\thelp\n";
print $pkg->{description};
print "\n";
@@ -66,10 +63,6 @@ while ($line = <>) {
my @dep = split /,\s*/, $1;
$pkg->{depends} = \@dep;
};
- $line =~ /^Needs: \s*(.+)\s*$/ and do {
- my @need = split /,\s*/, $1;
- $pkg->{needs} = \@need;
- };
$line =~ /^Category: \s*(.+)\s*$/ and do {
$pkg->{category} = $1;
defined $category{$1} or $category{$1} = {};