summaryrefslogtreecommitdiff
path: root/parallel
diff options
context:
space:
mode:
Diffstat (limited to 'parallel')
-rw-r--r--parallel/mpi-ch/buildlink3.mk19
-rw-r--r--parallel/pvm3/buildlink3.mk20
2 files changed, 12 insertions, 27 deletions
diff --git a/parallel/mpi-ch/buildlink3.mk b/parallel/mpi-ch/buildlink3.mk
index 154d9a90f45..fb07a2cccd0 100644
--- a/parallel/mpi-ch/buildlink3.mk
+++ b/parallel/mpi-ch/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/05/29 20:27:47 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:13 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-MPICH2_BUILDLINK3_MK:= ${MPICH2_BUILDLINK3_MK}+
+BUILDLINK_TREE+= mpich2
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= mpich2
-.endif
+.if !defined(MPICH2_BUILDLINK3_MK)
+MPICH2_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmpich2}
-BUILDLINK_PACKAGES+= mpich2
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mpich2
-
-.if !empty(MPICH2_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.mpich2+= mpich2>=1.0.7
BUILDLINK_PKGSRCDIR.mpich2?= ../../parallel/mpi-ch
BUILDLINK_DEPMETHOD.mpich2?= build
-.endif # MPICH2_BUILDLINK3_MK
+.endif # MPICH2_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -mpich2
diff --git a/parallel/pvm3/buildlink3.mk b/parallel/pvm3/buildlink3.mk
index 00cb5e9639c..152701e13cc 100644
--- a/parallel/pvm3/buildlink3.mk
+++ b/parallel/pvm3/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:13 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PVM_BUILDLINK3_MK:= ${PVM_BUILDLINK3_MK}+
+BUILDLINK_TREE+= pvm
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= pvm
-.endif
+.if !defined(PVM_BUILDLINK3_MK)
+PVM_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npvm}
-BUILDLINK_PACKAGES+= pvm
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pvm
-
-.if !empty(PVM_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.pvm+= pvm>=3.4.3
BUILDLINK_ABI_DEPENDS.pvm+= pvm>=3.4.5nb1
BUILDLINK_PKGSRCDIR.pvm?= ../../parallel/pvm3
@@ -19,7 +12,6 @@ BUILDLINK_PKGSRCDIR.pvm?= ../../parallel/pvm3
. include "${BUILDLINK_PKGSRCDIR.pvm}/arch.mk"
BUILDLINK_INCDIRS.pvm?= pvm3/include
BUILDLINK_LIBDIRS.pvm?= pvm3/lib/${PVM_ARCH}
+.endif # PVM_BUILDLINK3_MK
-.endif # PVM_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -pvm