From cb1e73659b5b75a7e46de33ed331a2f14f950dbc Mon Sep 17 00:00:00 2001
From: asau <asau>
Date: Wed, 24 Oct 2012 05:49:25 +0000
Subject: Reexport libxml2 from hwloc. Reexport hwloc from openmpi. This should
 fix builds with MPI_TYPE=openmpi.

---
 parallel/openmpi/Makefile      | 3 +--
 parallel/openmpi/buildlink3.mk | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'parallel/openmpi')

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
-- 
cgit v1.2.3