pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/parallel Reexport libxml2 from hwloc.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee7fd001f9b1
branches:  trunk
changeset: 610417:ee7fd001f9b1
user:      asau <asau%pkgsrc.org@localhost>
date:      Wed Oct 24 05:49:25 2012 +0000

description:
Reexport libxml2 from hwloc.
Reexport hwloc from openmpi.
This should fix builds with MPI_TYPE=openmpi.

diffstat:

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

diffs (50 lines):

diff -r ef3e7030e01f -r ee7fd001f9b1 parallel/hwloc/buildlink3.mk
--- a/parallel/hwloc/buildlink3.mk      Tue Oct 23 20:49:38 2012 +0000
+++ b/parallel/hwloc/buildlink3.mk      Wed Oct 24 05:49:25 2012 +0000
@@ -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 @@
 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 -r ef3e7030e01f -r ee7fd001f9b1 parallel/openmpi/Makefile
--- a/parallel/openmpi/Makefile Tue Oct 23 20:49:38 2012 +0000
+++ b/parallel/openmpi/Makefile Wed Oct 24 05:49:25 2012 +0000
@@ -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 @@
 .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 -r ef3e7030e01f -r ee7fd001f9b1 parallel/openmpi/buildlink3.mk
--- a/parallel/openmpi/buildlink3.mk    Tue Oct 23 20:49:38 2012 +0000
+++ b/parallel/openmpi/buildlink3.mk    Wed Oct 24 05:49:25 2012 +0000
@@ -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 @@
 
 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



Home | Main Index | Thread Index | Old Index