On NetBSD, link against libexecinfo when backtrace(3) is desired.

4 files changed, 36 insertions, 2 deletions

diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index af65051d19f..9b1cf7f831e 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2012/10/03 21:57:14 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2013/02/26 23:36:17 joerg Exp $
 
 DISTNAME=	mpich2-1.4.1p1
 PKGREVISION=	1
@@ -63,6 +63,12 @@ CONF_FILES+=		share/${PKGBASE}/examples/mpif77.conf \
 BUILDLINK_TRANSFORM+=	rm:-lrt
 .endif
 
+.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
+MAKE_ENV+=	LIBEXECINFO=-lexecinfo
+.else
+MAKE_ENV+=	LIBEXECINFO=
+.endif
+
 .include "options.mk"
 
 .include "../../parallel/openpa/buildlink3.mk"
diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo
index 1fe7f511065..73b3aa20628 100644
--- a/parallel/mpi-ch/distinfo
+++ b/parallel/mpi-ch/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2012/09/15 21:25:27 dholland Exp $
+$NetBSD: distinfo,v 1.20 2013/02/26 23:36:17 joerg Exp $
 
 SHA1 (mpich2-1.4.1p1.tar.gz) = 8dcc8888fb27232eb8f76c11cc890f1c3c483804
 RMD160 (mpich2-1.4.1p1.tar.gz) = 1d355cc07b8675af77b1c255fd10696844447298
@@ -7,4 +7,6 @@ SHA1 (patch-Makefile.in) = c7e8398952d3b60d1325661ef0055c72930c70f9
 SHA1 (patch-aa) = f7d5fc3be6b2679ef0937615cc9c5b4229acb22a
 SHA1 (patch-ac) = b956a355ef381d759077288916c40e32b022f178
 SHA1 (patch-src_mpe2_Makefile_in) = a72b4edea6e59b0b4e59454e4d5910e01e689548
+SHA1 (patch-src_mpe2_src_callstack_src_Makefile.in) = 4f46ffad18f7d18ffeed7b703a57056a202e745a
+SHA1 (patch-src_mpe2_src_logging_src_Makefile.in) = e266eea99bc88ec93f892cbcb64e1560236b1b2d
 SHA1 (patch-src_pm_hydra_configure) = 9d42c909464fa24af7a079c03a75ae03aa3f8ee5
diff --git a/parallel/mpi-ch/patches/patch-src_mpe2_src_callstack_src_Makefile.in b/parallel/mpi-ch/patches/patch-src_mpe2_src_callstack_src_Makefile.in
new file mode 100644
index 00000000000..17dccc994dd
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-src_mpe2_src_callstack_src_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mpe2_src_callstack_src_Makefile.in,v 1.1 2013/02/26 23:36:17 joerg Exp $
+
+--- src/mpe2/src/callstack/src/Makefile.in.orig	2013-02-26 21:04:07.000000000 +0000
++++ src/mpe2/src/callstack/src/Makefile.in
+@@ -25,7 +25,7 @@ CFLAGS               = @CFLAGS@
+ MPE_LIBDIR           = @libbuild_dir@
+ LIB_PATH             = $(MPI_LIBS)
+ PROF_LIBS            = -L$(MPE_LIBDIR) @PROF_LIBS@ $(MPI_LIBS)
+-LDFLAGS              = @LDFLAGS@
++LDFLAGS              = @LDFLAGS@ ${LIBEXECINFO}
+ MPE_BUILD_FORTRAN2C  = @MPE_BUILD_FORTRAN2C@
+ CC_DOES_C_O          = @CC_DOES_C_O@
+ 
diff --git a/parallel/mpi-ch/patches/patch-src_mpe2_src_logging_src_Makefile.in b/parallel/mpi-ch/patches/patch-src_mpe2_src_logging_src_Makefile.in
new file mode 100644
index 00000000000..8313e85b4ad
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-src_mpe2_src_logging_src_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mpe2_src_logging_src_Makefile.in,v 1.1 2013/02/26 23:36:17 joerg Exp $
+
+--- src/mpe2/src/logging/src/Makefile.in.orig	2013-02-26 21:04:35.000000000 +0000
++++ src/mpe2/src/logging/src/Makefile.in
+@@ -25,7 +25,7 @@ CFLAGS               = @CFLAGS@
+ MPE_LIBDIR           = @libbuild_dir@
+ LIB_PATH             = $(MPI_LIBS)
+ PROF_LIBS            = -L$(MPE_LIBDIR) @PROF_LIBS@ $(MPI_LIBS)
+-LDFLAGS              = @LDFLAGS@
++LDFLAGS              = @LDFLAGS@ ${LIBEXECINFO}
+ MPE_BUILD_FORTRAN2C  = @MPE_BUILD_FORTRAN2C@
+ CC_DOES_C_O          = @CC_DOES_C_O@
+