From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 31 14:40:03 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF6EC106564A for ; Tue, 31 Mar 2009 14:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 976538FC16 for ; Tue, 31 Mar 2009 14:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VEe3CQ030594 for ; Tue, 31 Mar 2009 14:40:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n2VEe31b030591; Tue, 31 Mar 2009 14:40:03 GMT (envelope-from gnats) Resent-Date: Tue, 31 Mar 2009 14:40:03 GMT Resent-Message-Id: <200903311440.n2VEe31b030591@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Florian Smeets Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 523471065672 for ; Tue, 31 Mar 2009 14:36:49 +0000 (UTC) (envelope-from flo@280r.solomo.de) Received: from mail.solomo.de (mail.solomo.de [85.214.49.72]) by mx1.freebsd.org (Postfix) with ESMTP id EAF138FC12 for ; Tue, 31 Mar 2009 14:36:48 +0000 (UTC) (envelope-from flo@280r.solomo.de) Received: from localhost (localhost [127.0.0.1]) by mail.solomo.de (Postfix) with ESMTP id 6D7413F50D; Tue, 31 Mar 2009 16:36:47 +0200 (CEST) Received: from mail.solomo.de ([127.0.0.1]) by localhost (mail.solomo.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id KAXThnFy43Pu; Tue, 31 Mar 2009 16:36:45 +0200 (CEST) Received: from 280r.solomo.de (unknown [212.185.53.228]) by mail.solomo.de (Postfix) with ESMTP id E1A6E3F4A8; Tue, 31 Mar 2009 16:36:44 +0200 (CEST) Received: by 280r.solomo.de (Postfix, from userid 1001) id 9D94ED1E7; Tue, 31 Mar 2009 16:36:44 +0200 (CEST) Message-Id: <20090331143644.9D94ED1E7@280r.solomo.de> Date: Tue, 31 Mar 2009 16:36:44 +0200 (CEST) From: Florian Smeets To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: stephen@math.missouri.edu Subject: ports/133242: [PATCH] science/gromacs: fix sparc64, fix WITH_MPICH X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Mar 2009 14:40:04 -0000 >Number: 133242 >Category: ports >Synopsis: [PATCH] science/gromacs: fix sparc64, fix WITH_MPICH >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Mar 31 14:40:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Florian Smeets >Release: FreeBSD 8.0-CURRENT sparc64 >Organization: >Environment: System: FreeBSD 280r.solomo.de 8.0-CURRENT FreeBSD 8.0-CURRENT #34 r190520M: Sun Mar 29 15:18:18 CEST >Description: - remove BROKEN on sparc64, a patch was added to files/ - fix portlint warnings - use ${LOCALBASE} instead of ${PREFIX} in *_DEPENDS - fix IGNORE - fix WITH_MPICH, net/mpich -> net/mpich2 Added file(s): - files/patch-include__gmx_cyclecounter.h Port maintainer (stephen@math.missouri.edu) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- gromacs-4.0.3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/science/gromacs.orig/Makefile /usr/ports/science/gromacs/Makefile --- /usr/ports/science/gromacs.orig/Makefile 2009-03-30 19:05:00.480929887 +0200 +++ /usr/ports/science/gromacs/Makefile 2009-03-31 16:26:03.885269656 +0200 @@ -27,7 +27,7 @@ GSL "Enable extra analysis using math/gsl" on \ FLOAT "Use single instead of double precision" off \ X11 "Build and install X11 programs" on \ - MPICH "Enable MPI support using net/mpich" off \ + MPICH "Enable MPI support using net/mpich2" off \ OMPI "Enable MPI support using net/openmpi" off .include @@ -37,11 +37,11 @@ .endif .if !defined(WITHOUT_FFTW3) && defined(WITH_FFTW2) -IGNORE= Cannot build with FFTW3 and FFTW2. Run 'make config' again and choose only one of them. +IGNORE= cannot build with FFTW3 and FFTW2. Run 'make config' again and choose only one of them .endif .if defined(WITH_MPICH) && defined(WITH_OMPI) -IGNORE= Cannot build with MPICH and OpenMPI support. Run 'make config' again and choose only one of them. +IGNORE= cannot build with MPICH and OpenMPI support. Run 'make config' again and choose only one of them .endif .if !defined(WITHOUT_FFTW3) @@ -89,15 +89,15 @@ .if defined(WITH_MPICH) || defined(WITH_OMPI) CONFIGURE_ARGS+= --enable-mpi -. if defined(WITH_MPICH) -CONFIGURE_ENV+= MPICC=${PREFIX}/mpich/bin/mpicc -BUILD_DEPENDS+= ${PREFIX}/mpich/bin/mpicc:${PORTSDIR}/net/mpich -RUN_DEPENDS+= ${PREFIX}/mpich/bin/mpicc:${PORTSDIR}/net/mpich -. else +.if defined(WITH_MPICH) +CONFIGURE_ENV+= MPICC=${PREFIX}/mpich2/bin/mpicc +BUILD_DEPENDS+= ${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2 +RUN_DEPENDS+= ${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2 +.elif defined(WITH_OMPI) CONFIGURE_ENV+= MPICC=${PREFIX}/mpi/openmpi/bin/mpicc -BUILD_DEPENDS+= ${PREFIX}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi -RUN_DEPENDS+= ${PREFIX}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi -. endif +BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi +RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi +.endif PLIST_SUB+= SUFFIX_MPI="_mpi" MPI="" .else PLIST_SUB+= SUFFIX_MPI="" MPI="@comment " diff -ruN --exclude=CVS /usr/ports/science/gromacs.orig/files/patch-include__gmx_cyclecounter.h /usr/ports/science/gromacs/files/patch-include__gmx_cyclecounter.h --- /usr/ports/science/gromacs.orig/files/patch-include__gmx_cyclecounter.h 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/science/gromacs/files/patch-include__gmx_cyclecounter.h 2009-03-31 16:26:04.069279950 +0200 @@ -0,0 +1,11 @@ +--- ./include/gmx_cyclecounter.h.orig 2009-03-31 13:25:55.036329291 +0200 ++++ ./include/gmx_cyclecounter.h 2009-03-31 13:26:11.504803886 +0200 +@@ -408,7 +408,7 @@ + static __inline__ gmx_cycles_t gmx_cycles_read(void) + { + /* gcc inline assembly on sparc v9 */ +- ticks ret; ++ gmx_cycles_t ret; + __asm__("rd %%tick, %0" : "=r" (ret)); + return ret; + } --- gromacs-4.0.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: