Track information in a new variable BUILDLINK_ORDER that informs us

of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.

5 files changed, 10 insertions, 5 deletions

diff --git a/mk/bdb.buildlink3.mk b/mk/bdb.buildlink3.mk
index 9b9517e909f..e7a33946516 100644
--- a/mk/bdb.buildlink3.mk
+++ b/mk/bdb.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bdb.buildlink3.mk,v 1.15 2006/01/03 18:33:07 gdt Exp $
+# $NetBSD: bdb.buildlink3.mk,v 1.16 2006/07/08 22:39:30 jlam Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a Berkeley DB implementation.  It abstracts finding the
@@ -132,6 +132,7 @@ PKG_FAIL_REASON=	\
 .elif ${BDB_TYPE} == "db1"
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Ndb1}
 BUILDLINK_PACKAGES+=		db1
+BUILDLINK_ORDER+=		db1
 BUILDLINK_BUILTIN_MK.db1=	../../mk/db1.builtin.mk
 .else
 .  include "${_BDB_PKGSRCDIR.${BDB_TYPE}}/buildlink3.mk"
diff --git a/mk/dlopen.buildlink3.mk b/mk/dlopen.buildlink3.mk
index 477115a6b13..4f52460ef29 100644
--- a/mk/dlopen.buildlink3.mk
+++ b/mk/dlopen.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dlopen.buildlink3.mk,v 1.10 2005/12/05 22:07:07 rillig Exp $
+# $NetBSD: dlopen.buildlink3.mk,v 1.11 2006/07/08 22:39:30 jlam Exp $
 #
 # This Makefile fragment is included by package Makefiles and
 # buildlink3.mk files for the packages that use dlopen().
@@ -18,6 +18,7 @@ DL_AUTO_VARS?=	no
 .if !empty(USE_BUILTIN.dl:M[yY][eE][sS])
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Ndl}
 BUILDLINK_PACKAGES+=		dl
+BUILDLINK_ORDER+=		dl
 BUILDLINK_BUILTIN_MK.dl=	../../mk/dlopen.builtin.mk
 BUILDLINK_AUTO_VARS.dl=		${DL_AUTO_VARS}
 .elif !empty(MACHINE_PLATFORM:MDarwin-[56].*)
diff --git a/mk/oss.buildlink3.mk b/mk/oss.buildlink3.mk
index 0aaf2e8c841..3b7e16fd43b 100644
--- a/mk/oss.buildlink3.mk
+++ b/mk/oss.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: oss.buildlink3.mk,v 1.4 2006/03/13 16:10:15 jlam Exp $
+# $NetBSD: oss.buildlink3.mk,v 1.5 2006/07/08 22:39:30 jlam Exp $
 #
 # This Makefile fragment is included by packages that require an Open Sound
 # System (OSS) implementation.  After inclusion of this file, the following
@@ -30,6 +30,7 @@ OSS_TYPE=		${_OSS_TYPE}
 
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Noss}
 BUILDLINK_PACKAGES+=		oss
+BUILDLINK_ORDER+=		oss
 BUILDLINK_BUILTIN_MK.oss=	../../mk/oss.builtin.mk
 
 .if !empty(OSS_BUILDLINK3_MK:M+)
diff --git a/mk/pam.buildlink3.mk b/mk/pam.buildlink3.mk
index 478f7b848bc..c48f5e10822 100644
--- a/mk/pam.buildlink3.mk
+++ b/mk/pam.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pam.buildlink3.mk,v 1.5 2005/06/16 17:40:56 salo Exp $
+# $NetBSD: pam.buildlink3.mk,v 1.6 2006/07/08 22:39:30 jlam Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a PAM implementation.  pam.buildlink3.mk will:
@@ -86,4 +86,5 @@ PKG_FAIL_REASON=	\
 .elif ${PAM_TYPE} == "solaris-pam"
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsolaris-pam}
 BUILDLINK_PACKAGES+=	solaris-pam
+BUILDLINK_ORDER+=	solaris-pam
 .endif
diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk
index 657dab28d4f..9614142b7c1 100644
--- a/mk/pthread.buildlink3.mk
+++ b/mk/pthread.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink3.mk,v 1.22 2006/04/06 06:23:06 reed Exp $
+# $NetBSD: pthread.buildlink3.mk,v 1.23 2006/07/08 22:39:30 jlam Exp $
 #
 # The pthreads strategy for pkgsrc is to "bless" a particular pthread
 # package as the Official Pthread Replacement (OPR).  The following
@@ -111,6 +111,7 @@ PTHREAD_AUTO_VARS?=	no
 .if ${PTHREAD_TYPE} == "native"
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Npthread}
 BUILDLINK_PACKAGES+=		pthread
+BUILDLINK_ORDER+=		pthread
 BUILDLINK_BUILTIN_MK.pthread=	../../mk/pthread.builtin.mk
 BUILDLINK_AUTO_VARS.pthread?=	${PTHREAD_AUTO_VARS}
 .elif ${PTHREAD_TYPE} == "${_PKG_PTHREAD}"