summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--parallel/hwloc/buildlink3.mk3
-rw-r--r--parallel/openmpi/Makefile3
-rw-r--r--parallel/openmpi/buildlink3.mk4
3 files changed, 6 insertions, 4 deletions
diff --git a/parallel/hwloc/buildlink3.mk b/parallel/hwloc/buildlink3.mk
index 4fd456ee128..b65f9990c06 100644
--- a/parallel/hwloc/buildlink3.mk
+++ b/parallel/hwloc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2012/03/21 13:31:35 asau Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2012/10/24 05:49:25 asau Exp $
BUILDLINK_TREE+= hwloc
@@ -8,6 +8,7 @@ HWLOC_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.hwloc+= hwloc>=1.4
BUILDLINK_PKGSRCDIR.hwloc?= ../../parallel/hwloc
+.include "../../textproc/libxml2/buildlink3.mk" # optional
.endif # HWLOC_BUILDLINK3_MK
BUILDLINK_TREE+= -hwloc
diff --git a/parallel/openmpi/Makefile b/parallel/openmpi/Makefile
index a324918a21e..d86f8653fc1 100644
--- a/parallel/openmpi/Makefile
+++ b/parallel/openmpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/17 23:27:34 asau Exp $
+# $NetBSD: Makefile,v 1.19 2012/10/24 05:49:26 asau Exp $
DISTNAME= openmpi-1.6.2
CATEGORIES= parallel
@@ -52,5 +52,4 @@ LIBLTDL_CONVENIENCE_SUBDIR= opal/libltdl
.include "../../devel/libltdl/convenience.mk" # for "test" target to work
.include "../../devel/libltdl/buildlink3.mk"
.include "../../parallel/hwloc/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk" # should be reexported by hwloc?
.include "../../mk/bsd.pkg.mk"
diff --git a/parallel/openmpi/buildlink3.mk b/parallel/openmpi/buildlink3.mk
index 711e4e4d6f7..830b3d93a17 100644
--- a/parallel/openmpi/buildlink3.mk
+++ b/parallel/openmpi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/12/16 21:00:53 asau Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2012/10/24 05:49:26 asau Exp $
BUILDLINK_TREE+= openmpi
@@ -7,6 +7,8 @@ OPENMPI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.openmpi+= openmpi>=1.5.1
BUILDLINK_PKGSRCDIR.openmpi?= ../../parallel/openmpi
+
+.include "../../parallel/hwloc/buildlink3.mk"
.endif # OPENMPI_BUILDLINK3_MK
BUILDLINK_TREE+= -openmpi