From fddef737af2093d929cb970859a1a2c22095cae7 Mon Sep 17 00:00:00 2001 From: asau Date: Sun, 16 May 2010 12:04:03 +0000 Subject: Build with MPI support by default. Introduce "mpi" option to turn the above off. Bump PKGREVISION. --- biology/gromacs/Makefile | 3 ++- biology/gromacs/PLIST | 8 ++++---- biology/gromacs/distinfo | 3 ++- biology/gromacs/options.mk | 15 ++++++++++++--- biology/gromacs/patches/patch-ad | 15 +++++++++++++++ 5 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 biology/gromacs/patches/patch-ad (limited to 'biology') diff --git a/biology/gromacs/Makefile b/biology/gromacs/Makefile index 6a1c711d77e..ee0f078fc78 100644 --- a/biology/gromacs/Makefile +++ b/biology/gromacs/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/03/15 14:08:49 asau Exp $ +# $NetBSD: Makefile,v 1.2 2010/05/16 12:04:03 asau Exp $ # DISTNAME= gromacs-4.0.7 +PKGREVISION= 1 CATEGORIES= biology MASTER_SITES= ftp://ftp.gromacs.org/pub/gromacs/ diff --git a/biology/gromacs/PLIST b/biology/gromacs/PLIST index 1eefe4bba92..4fc7f1146ba 100644 --- a/biology/gromacs/PLIST +++ b/biology/gromacs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/15 14:08:49 asau Exp $ +@comment $NetBSD: PLIST,v 1.2 2010/05/16 12:04:03 asau Exp $ bin/GMXRC bin/GMXRC.bash bin/GMXRC.csh @@ -246,9 +246,9 @@ include/gromacs/writeps.h include/gromacs/xdrf.h include/gromacs/xtcio.h include/gromacs/xvgr.h -lib/libgmx_d.la -lib/libgmxana_d.la -lib/libmd_d.la +lib/libgmx${MPI}_d.la +lib/libgmxana${MPI}_d.la +lib/libmd${MPI}_d.la man/man1/anadock.1 man/man1/do_dssp.1 man/man1/editconf.1 diff --git a/biology/gromacs/distinfo b/biology/gromacs/distinfo index 39cee7939aa..4efe9df9de4 100644 --- a/biology/gromacs/distinfo +++ b/biology/gromacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/03/15 14:08:49 asau Exp $ +$NetBSD: distinfo,v 1.2 2010/05/16 12:04:03 asau Exp $ SHA1 (gromacs-4.0.7.tar.gz) = 8519bef2fa989fb487d54612b0a2d0228f228b30 RMD160 (gromacs-4.0.7.tar.gz) = 4fa8e5c90f549ef627a98a907a166676692a4c4b @@ -6,3 +6,4 @@ Size (gromacs-4.0.7.tar.gz) = 8404518 bytes SHA1 (patch-aa) = dcf39e862c2087bca0cd4e577438633bf70fe57f SHA1 (patch-ab) = 333fea1f0844f8628795f593de16c941744b11d2 SHA1 (patch-ac) = 164a7b3e06ab4f4cc1142615c1281eec82adee9b +SHA1 (patch-ad) = 68b37154ba466e28cad0e539e25253c901421aaa diff --git a/biology/gromacs/options.mk b/biology/gromacs/options.mk index 55502741ee5..c0e3f3653e8 100644 --- a/biology/gromacs/options.mk +++ b/biology/gromacs/options.mk @@ -1,13 +1,22 @@ -# $NetBSD: options.mk,v 1.1.1.1 2010/03/15 14:08:49 asau Exp $ +# $NetBSD: options.mk,v 1.2 2010/05/16 12:04:03 asau Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gromacs -PKG_SUPPORTED_OPTIONS+= x11 -PKG_SUGGESTED_OPTIONS+= x11 +PKG_SUPPORTED_OPTIONS+= mpi x11 +PKG_SUGGESTED_OPTIONS+= mpi x11 .include "../../mk/bsd.options.mk" PLIST_VARS= x11 +# MPI support: +.if !empty(PKG_OPTIONS:Mmpi) +CONFIGURE_ARGS+= --enable-mpi +PLIST_SUBST+= MPI=_mpi +.include "../../mk/mpi.buildlink3.mk" +.else +PLIST_SUBST+= MPI= +.endif + # X support: .if !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --with-x diff --git a/biology/gromacs/patches/patch-ad b/biology/gromacs/patches/patch-ad new file mode 100644 index 00000000000..a8e87912087 --- /dev/null +++ b/biology/gromacs/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 2010/05/16 12:04:03 asau Exp $ + +Libtool wants tag nowadays. + +--- src/gmxlib/nonbonded/nb_kernel_ia32_sse2/Makefile.in.orig 2010-05-15 00:44:35.000000000 +0400 ++++ src/gmxlib/nonbonded/nb_kernel_ia32_sse2/Makefile.in 2010-05-15 00:49:20.000000000 +0400 +@@ -86,7 +86,7 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) +-LTCCASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++LTCCASCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) + SOURCES = $(libnb_kernel_ia32_sse2_la_SOURCES) + DIST_SOURCES = $(libnb_kernel_ia32_sse2_la_SOURCES) -- cgit v1.2.3