From 7db11b582a4d621362622fad99df1da62e930ffa Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 18 Mar 2004 09:12:08 +0000 Subject: Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly by moving the inclusion of buildlink3.mk files outside of the protected region. This bug would be seen by users that have set PREFER_PKGSRC or PREFER_NATIVE to non-default values. BUILDLINK_PACKAGES should be ordered so that for any package in the list, that package doesn't depend on any packages to the left of it in the list. This ordering property is used to check for builtin packages in the correct order. The problem was that including a buildlink3.mk file for correctly ensured that was removed from BUILDLINK_PACKAGES and appended to the end. However, since the inclusion of any other buildlink3.mk files within that buildlink3.mk was in a region that was protected against multiple inclusion, those dependencies weren't also moved to the end of BUILDLINK_PACKAGES. --- x11/controlcenter/buildlink3.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'x11/controlcenter') diff --git a/x11/controlcenter/buildlink3.mk b/x11/controlcenter/buildlink3.mk index df114cd0b15..fcc5700714c 100644 --- a/x11/controlcenter/buildlink3.mk +++ b/x11/controlcenter/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ CONTROL_CENTER_BUILDLINK3_MK:= ${CONTROL_CENTER_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= control-center .if !empty(CONTROL_CENTER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.control-center+= control-center>=1.4.0.4nb5 BUILDLINK_PKGSRCDIR.control-center?= ../../x11/controlcenter +.endif # CONTROL_CENTER_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.control-center?= ../../x11/controlcenter .include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../x11/gnome-libs/buildlink3.mk" -.endif # CONTROL_CENTER_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -- cgit v1.2.3