From 5b4a5f2bf4fb1440241091cba32eec0d4adcd615 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. --- www/mozilla/buildlink3.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'www/mozilla') diff --git a/www/mozilla/buildlink3.mk b/www/mozilla/buildlink3.mk index bbbe8efdcd8..7e2ac102ea1 100644 --- a/www/mozilla/buildlink3.mk +++ b/www/mozilla/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}+ MOZILLA_BUILDLINK3_MK:= ${MOZILLA_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= mozilla .if !empty(MOZILLA_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.mozilla+= mozilla>=1.6 BUILDLINK_PKGSRCDIR.mozilla?= ../../www/mozilla +.endif # MOZILLA_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/gdk-pixbuf/buildlink3.mk" @@ -20,7 +21,5 @@ BUILDLINK_PKGSRCDIR.mozilla?= ../../www/mozilla .include "../../graphics/png/buildlink3.mk" .include "../../net/ORBit/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" - -.endif # MOZILLA_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -- cgit v1.2.3