summaryrefslogtreecommitdiff
path: root/scripts/feeds
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-17 02:20:34 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-17 02:20:34 +0000
commite83c4ff72150271fc703f362b0b6acee11d51d8c (patch)
tree551d39ed952b9f21489103c31c067b4af6f8a22d /scripts/feeds
parentf76f86c856294168e9596318000787ff58446641 (diff)
move host build in packages into a separate namespace: package/<name>/host/<target>
this allows dependencies between host and target packages, and saves unnecessary host builds for packages that contain both variants git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14905 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts/feeds')
-rwxr-xr-xscripts/feeds3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/feeds b/scripts/feeds
index deafaca126..e51b17c372 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -327,10 +327,11 @@ sub install_package {
# install all dependencies
foreach my $vpkg (@{$srcpackage{$src}}, $pkg) {
- foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
+ foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}, @{$vpkg->{"builddepends/host"}}) {
next if $dep =~ /@/;
$dep =~ s/^\+//;
$dep =~ s/^.+://;
+ $dep =~ s/\/.+$//;
next unless $dep;
install_package($feed, $dep) == 0 or $ret = 1;
}