Date: Thu, 23 Nov 2006 18:36:00 +0100 (CET) From: trasz <trasz@pin.if.uz.zgora.pl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/105795: [PATCH] math/petsc: update to 2.3.2.p6 Message-ID: <20061123173600.AE22539DB8@pin.if.uz.zgora.pl> Resent-Message-ID: <200611231740.kANHeBqm019138@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105795 >Category: ports >Synopsis: [PATCH] math/petsc: update to 2.3.2.p6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Nov 23 17:40:10 GMT 2006 >Closed-Date: >Last-Modified: >Originator: trasz >Release: FreeBSD 6.1-RELEASE-p10 i386 >Organization: >Environment: System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Wed Nov 15 19:16:30 CET 2006 >Description: - Update to 2.3.2.p6 - Add OpenMPI support Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- petsc-2.3.2.p6,1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/math/petsc/Makefile /home/trasz/petsc/Makefile --- /usr/ports/math/petsc/Makefile Sat Sep 2 23:59:18 2006 +++ /home/trasz/petsc/Makefile Thu Nov 23 18:31:03 2006 @@ -6,7 +6,7 @@ # PORTNAME= petsc -DISTVERSION= 2.3.2-p0 +DISTVERSION= 2.3.2-p6 PORTEPOCH= 1 CATEGORIES= math parallel MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/ @@ -64,6 +64,11 @@ .include <bsd.port.pre.mk> +.if exists(${LOCALBASE}/mpi/openmpi/bin/mpirun) +WITH_OPENMPI= yes +MPIDIR= ${LOCALBASE}/mpi/openmpi +.endif + .if ${ARCH} == "amd64" WITHOUT_SUPERLU= yes .endif @@ -79,12 +84,26 @@ .endif .if defined(WITH_MPI) . if exists(${LOCALBASE}/include/mpi.h) -BROKEN= Cannot build with mpich when lam-7 is installed - set WITHOUT_MPI or deinstall net/lam +BROKEN= Cannot build with MPI when lam-7 is installed - set WITHOUT_MPI or deinstall net/lam . endif +.if defined(WITH_OPENMPI) +MPIDIR= ${LOCALBASE}/mpi/openmpi +BUILD_DEPENDS+= ${MPIDIR}/lib/libmpi.so:${PORTSDIR}/net/openmpi +RUN_DEPENDS+= ${MPIDIR}/lib/libmpi.so:${PORTSDIR}/net/openmpi +PKGNAMESUFFIX+= -openmpi +MAKE_ENV+= PATH=${MPIDIR}/bin:${PATH} +# math/blocksolve95 does not pass regression test when compiled with OpenMPI. +WITHOUT_BS95= yes +WITHOUT_SPOOLES= yes +WITHOUT_PARMETIS= yes +CONFIGURE_ARGS+= --with-cc=${MPIDIR}/bin/mpicc --with-fc=${MPIDIR}/bin/mpif77 +.else +BUILD_DEPENDS+= ${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2 +RUN_DEPENDS+= ${LOCALBASE}/mpich2/bin/mpirun:${PORTSDIR}/net/mpich2 PKGNAMESUFFIX+= -mpich -BUILD_DEPENDS+= ${MPIDIR}/bin/mpicc:${PORTSDIR}/net/mpich2 -RUN_DEPENDS+= ${MPIDIR}/bin/mpirun:${PORTSDIR}/net/mpich2 -CONFIGURE_ARGS+= --with-mpi-dir=${LOCALBASE}/mpich2 +.endif + +CONFIGURE_ARGS+= --with-mpi-dir=${MPIDIR} CONFLICTS= petsc-2* PLIST_SUB+= MPIUNI="@comment " .else @@ -198,10 +217,10 @@ pre-everything:: @${ECHO_MSG} .if !defined (WITH_MPI) - @${ECHO_MSG} "Define WITH_MPI to use mpich." + @${ECHO_MSG} "Define WITH_MPI to use MPI." @${ECHO_MSG} "Note: this is not compatible with Python bindings!" .elif !defined (WITHOUT_MPI) - @${ECHO_MSG} "Define WITHOUT_MPI to not use mpich." + @${ECHO_MSG} "Define WITHOUT_MPI to not use MPI." .endif .if !defined (WITH_SVN) @${ECHO_MSG} "Define WITH_SVN to use subversion." @@ -261,7 +280,7 @@ .if defined(MAINTAINER_MODE) regression-test: -. if defined (WITH_MPI) +. if defined (WITH_MPI) && !defined(WITH_OPENMPI) . if !exists(${HOME}/.mpd.conf) @${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf ${CHMOD} go-r ${HOME}/.mpd.conf @@ -271,7 +290,7 @@ . endif @(cd ${BUILD_WRKSRC}; \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test) -. if defined (WITH_MPI) +. if defined (WITH_MPI) && !defined(WITH_OPENMPI) ${LOCALBASE}/mpich2/bin/mpdallexit . endif .endif diff -ruN --exclude=CVS /usr/ports/math/petsc/distinfo /home/trasz/petsc/distinfo --- /usr/ports/math/petsc/distinfo Sat Sep 2 23:59:18 2006 +++ /home/trasz/petsc/distinfo Thu Nov 23 18:31:04 2006 @@ -1,3 +1,3 @@ -MD5 (petsc-2.3.2-p0.tar.gz) = 3cec21fb34e17d22b5c887ddb9f80f33 -SHA256 (petsc-2.3.2-p0.tar.gz) = 1b4e778a2a0fd681056fbf31efb8b74a07f141644dd9e87a2644539023f5fbcf -SIZE (petsc-2.3.2-p0.tar.gz) = 10716948 +MD5 (petsc-2.3.2-p6.tar.gz) = 708e45215501278a5c5ad1dd7711a16c +SHA256 (petsc-2.3.2-p6.tar.gz) = 4c9aa232499efae58633d1f753c4f361726fe46c6eb1e3840d78b38ce8248563 +SIZE (petsc-2.3.2-p6.tar.gz) = 10837543 --- petsc-2.3.2.p6,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061123173600.AE22539DB8>