diff options
| -rw-r--r-- | parallel/openmpi/Makefile | 5 | ||||
| -rw-r--r-- | parallel/openmpi/PLIST.sge | 3 | ||||
| -rw-r--r-- | parallel/openmpi/options.mk | 12 |
3 files changed, 15 insertions, 5 deletions
diff --git a/parallel/openmpi/Makefile b/parallel/openmpi/Makefile index 26d1db271cf..ba670a7b6af 100644 --- a/parallel/openmpi/Makefile +++ b/parallel/openmpi/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2014/02/18 22:21:33 joerg Exp $ +# $NetBSD: Makefile,v 1.26 2014/05/22 13:24:49 manu Exp $ DISTNAME= openmpi-1.6.4 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= parallel MASTER_SITES= http://www.open-mpi.org/software/ompi/v1.6/downloads/ EXTRACT_SUFX= .tar.bz2 @@ -20,7 +20,6 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool \ SHLIBTOOL_OVERRIDE= ${WRKSRC}/config/libtool.m4 \ ${WRKSRC}/opal/libltdl/m4/libtool.m4 -CONFIGURE_ARGS+= --without-sge CONFIGURE_ARGS+= --without-slurm CONFIGURE_ARGS+= --enable-contrib-no-build=vt # in separate package CONFIGURE_ARGS+= --with-libltdl=external # use our libltdl diff --git a/parallel/openmpi/PLIST.sge b/parallel/openmpi/PLIST.sge new file mode 100644 index 00000000000..3f2335f321b --- /dev/null +++ b/parallel/openmpi/PLIST.sge @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST.sge,v 1.1 2014/05/22 13:24:49 manu Exp $ +lib/openmpi/mca_ras_gridengine.la +share/openmpi/help-ras-gridengine.txt diff --git a/parallel/openmpi/options.mk b/parallel/openmpi/options.mk index ec4f8b39a33..07909492c82 100644 --- a/parallel/openmpi/options.mk +++ b/parallel/openmpi/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.6 2014/02/19 09:44:56 jperkin Exp $ +# $NetBSD: options.mk,v 1.7 2014/05/22 13:24:49 manu Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openmpi -PKG_SUPPORTED_OPTIONS= debug f90 +PKG_SUPPORTED_OPTIONS= debug f90 sge .include "../../mk/bsd.options.mk" @@ -27,4 +27,12 @@ SUBST_SED.f90+= -e 's,^linker_flags=,linker_flags= -L${GCCDIR}/lib ,' CONFIGURE_ARGS+= --disable-mpi-f90 .endif + +.if !empty(PKG_OPTIONS:Msge) +CONFIGURE_ARGS+= --with-sge +PLIST_SRC+= ${PKGDIR}/PLIST.sge +.else +CONFIGURE_ARGS+= --without-sge +.endif + PLIST_SRC+= PLIST |