pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/parallel/mpi-ch Make this work on IRIX.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/82f924ba4f48
branches:  trunk
changeset: 490309:82f924ba4f48
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Mon Mar 07 02:08:37 2005 +0000

description:
Make this work on IRIX.
Other non-NetBSD OS probably want to check this, too, since so far we've
always built with --with-arch=netbsd...

diffstat:

 parallel/mpi-ch/Makefile |  13 +++++++++----
 parallel/mpi-ch/PLIST    |   4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diffs (59 lines):

diff -r dd8fab999ffb -r 82f924ba4f48 parallel/mpi-ch/Makefile
--- a/parallel/mpi-ch/Makefile  Mon Mar 07 01:28:45 2005 +0000
+++ b/parallel/mpi-ch/Makefile  Mon Mar 07 02:08:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/03/03 12:01:30 garbled Exp $
+# $NetBSD: Makefile,v 1.34 2005/03/07 02:08:37 jschauma Exp $
 
 DISTNAME=              mpich-1.2.6
 CATEGORIES=            parallel
@@ -30,7 +30,6 @@
 CONFIGURE_ARGS+=       -htmldir=${PREFIX}/share/doc/html/mpi-ch
 CONFIGURE_ARGS+=       -opt=-O
 CONFIGURE_ARGS+=       -rsh=${MPI_RSH}
-CONFIGURE_ARGS+=       --with-arch=netbsd
 CONFIGURE_ARGS+=       --with-comm=ch_p4
 CONFIGURE_ARGS+=       --with-mpe
 CONFIGURE_ARGS+=       --disable-devdebug
@@ -38,6 +37,14 @@
 CONFIGURE_ARGS+=       --disable-f90modules
 CONFIGURE_ENV+=                sysconfdir=${PKG_SYSCONFDIR}
 
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ARGS+=       --with-arch=netbsd
+PLIST_SUBST+=          MPICH_OPSYS="${LOWER_OPSYS}"
+.elif ${OPSYS} == "IRIX"
+CONFIGURE_ARGS+=       --with-arch=IRIX${ABI:S/32/N32/}
+PLIST_SUBST+=          MPICH_OPSYS="${OPSYS}${ABI:S/32/N32/}"
+.endif
+
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-3*)
 CONFIGURE_ARGS+=       --disable-weak-symbols
@@ -47,8 +54,6 @@
 
 BUILD_DEFS+=           MPI_RSH
 
-.include "../../mk/bsd.prefs.mk"
-
 PLIST_SRC+=            ${PKGDIR}/PLIST
 
 .if ${MPI_RSH} == "rsh"
diff -r dd8fab999ffb -r 82f924ba4f48 parallel/mpi-ch/PLIST
--- a/parallel/mpi-ch/PLIST     Mon Mar 07 01:28:45 2005 +0000
+++ b/parallel/mpi-ch/PLIST     Mon Mar 07 02:08:37 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/03/03 12:07:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/03/07 02:08:37 jschauma Exp $
 bin/clog2alog
 bin/clog_print
 bin/mpicc
@@ -1918,7 +1918,7 @@
 share/examples/mpi-ch/test/topol/test.o
 share/examples/mpi-ch/test/topol/twod.f
 share/examples/mpi-ch/test/topol/twod2.f
-share/util/machines/machines.${LOWER_OPSYS}
+share/util/machines/machines.${MPICH_OPSYS}
 share/util/machines/machines.sample
 @dirrm share/util/machines
 @dirrm share/util



Home | Main Index | Thread Index | Old Index