cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a long-standing bug: add LIB_DEPENDS to the RUN_DEPENDS of a port, as

Browse Source 
there's a safeguard against self-depends anyways.
This prevents ports from getting moved from "built" to "installable"
prematurely.

For instance, devel/libsoup,-gnome doesn't directly depend on
net/glib2-networking, but it depends on devel/libsoup,-main which has
the net/glib2-networking.

Without this patch, dependencies on devel/libsoup,-gnome would often build
prematurely and build net/glib2-networking with them.
This commit is contained in:
espie 2011-06-15 10:09:31 +00:00
parent 755907c973
commit 2cf4d84ffd
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
infrastructure/lib/DPB/PkgPath.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: PkgPath.pm,v 1.9 2011/06/04 12:56:54 espie Exp $
# $OpenBSD: PkgPath.pm,v 1.10 2011/06/15 10:09:31 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -242,10 +242,12 @@ sub merge_depends
}
}
}
if (defined $info->{RUN_DEPENDS}) {
for my $d (values %{$info->{RUN_DEPENDS}}) {
$info->{RDEPENDS}{$d} = $d;
bless $info->{RDEPENDS}, "AddDepends";
for my $k (qw(LIB_DEPENDS RUN_DEPENDS)) {
if (defined $info->{$k}) {
for my $d (values %{$info->{$k}}) {
$info->{RDEPENDS}{$d} = $d;
bless $info->{RDEPENDS}, "AddDepends";
}
}
}
if (defined $info->{DIST}) {