Date: Wed, 20 Apr 2011 10:00:26 GMT From: Stas Timokhin <devel@stasyan.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/155655: [patch] science/meep Add Option to support MPI build Message-ID: <201104201000.p3KA0Q2j009631@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/155655; it has been noted by GNATS. From: Stas Timokhin <devel@stasyan.com> To: bug-followup@freebsd.org, aehlig@linta.de Cc: edwin@freebsd.org Subject: Re: ports/155655: [patch] science/meep Add Option to support MPI build Date: Wed, 20 Apr 2011 16:51:21 +0700 --Boundary-00=_ayqrNtdh/rruAt2 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Thanks for PRs. Both ports/155655 and ports/155469 are good additions to science/meep port. MPI knob should be turned on by deafult, because SMP hosts are cheap enough at 2011 ;-) Here is cumulative patch for them (meep_stast.txt) and patch for science/libctl (workaround for building libctl with libtool via copy-pasting from http://www.freebsd.org/cgi/query-pr.cgi?pr=155105&cat=ports). --Boundary-00=_ayqrNtdh/rruAt2 Content-Type: text/plain; charset="KOI8-R"; name="meep_stast.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="meep_stast.txt" --- Makefile.orig 2011-03-22 12:45:44.000000000 +0600 +++ Makefile 2011-03-22 13:10:54.000000000 +0600 @@ -7,7 +7,7 @@ PORTNAME= meep PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science MASTER_SITES= http://ab-initio.mit.edu/meep/ @@ -17,7 +17,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_FORTRAN= yes -USE_GCC= 4.4+ +USE_GCC= 4.5 USE_ICONV= yes USE_GETTEXT= yes USE_AUTOTOOLS+= libltdl @@ -27,11 +27,27 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LDFLAGS="${LDFLAGS}" BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash \ - harminv:${PORTSDIR}/science/harminv + harminv:${PORTSDIR}/science/harminv \ + gsed:${PORTSDIR}/textproc/gsed LIB_DEPENDS+= guile.20:${PORTSDIR}/lang/guile \ blas.2:${PORTSDIR}/math/blas \ ctl.4:${PORTSDIR}/science/libctl \ hdf5.0:${PORTSDIR}/science/hdf5 RUN_DEPENDS+= harminv:${PORTSDIR}/science/harminv -.include <bsd.port.mk> +OPTIONS= OPENMPI "Enable MPI support using openmpi" On + +.include <bsd.port.pre.mk> + +.if defined(WITH_OPENMPI) +BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpiCC:${PORTSDIR}/net/openmpi +RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi +CONFIGURE_ARGS+=--with-mpi +CONFIGURE_ENV+= MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC +PLIST_SUB+= MPI="" NOMPI="@comment " +.else +CONFIGURE_ARGS+=--without-mpi +PLIST_SUB+= MPI="@comment " NOMPI="" +.endif + +.include <bsd.port.post.mk> --- distinfo.orig 2009-12-21 10:58:03.000000000 +0600 +++ distinfo 2011-03-22 12:47:02.000000000 +0600 @@ -1,3 +1,2 @@ -MD5 (meep-1.1.1.tar.gz) = 415e0cd312b6caa22b5dd612490e1ccf SHA256 (meep-1.1.1.tar.gz) = 7a97b5555da1f9ea2ec6eed5c45bd97bcd6ddbd54bdfc181f46c696dffc169f2 SIZE (meep-1.1.1.tar.gz) = 751244 --- pkg-plist.orig 2011-03-22 12:54:12.000000000 +0600 +++ pkg-plist 2011-03-22 12:55:29.000000000 +0600 @@ -1,10 +1,14 @@ -bin/meep +%%NOMPI%%bin/meep +%%MPI%%bin/meep-mpi include/meep.hpp include/meep/mympi.hpp include/meep/vec.hpp -lib/libmeep.a -lib/libmeep.la -lib/pkgconfig/meep.pc +%%NOMPI%%lib/libmeep.a +%%MPI%%lib/libmeep_mpi.a +%%NOMPI%%lib/libmeep.la +%%MPI%%lib/libmeep_mpi.la +%%NOMPI%%lib/pkgconfig/meep.pc +%%MPI%%lib/pkgconfig/meep_mpi.pc share/meep/casimir.scm share/meep/meep-enums.scm share/meep/meep.scm --Boundary-00=_ayqrNtdh/rruAt2 Content-Type: text/plain; charset="KOI8-R"; name="libctl.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="libctl.txt" --- Makefile.orig 2011-03-12 03:27:31.000000000 +0600 +++ Makefile 2011-03-22 12:40:22.000000000 +0600 @@ -11,7 +11,7 @@ CATEGORIES= science math MASTER_SITES= http://ab-initio.mit.edu/libctl/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= devel@stasyan.com COMMENT= Control Language Library LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile @@ -19,19 +19,22 @@ USE_AUTOTOOLS= libtool USE_FORTRAN= yes USE_LDCONFIG= yes +MAKE_ENV+= PATH=${WRKDIR}:$$PATH + MAN1= gen-ctl-io.1 .include <bsd.port.pre.mk> -.if ${ARCH} == "i386" || ${ARCH} == "sparc64" -BROKEN= Does not compile on i386 or sparc64 -.endif - .if ${OSVERSION} < 700000 USE_FORTRAN= g77 .endif +post-patch: + ${LN} -s ${LOCALBASE}/bin/${CC} ${WRKDIR}/cc + ${LN} -s ${LOCALBASE}/bin/${CXX} ${WRKDIR}/c++ + + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} --Boundary-00=_ayqrNtdh/rruAt2--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104201000.p3KA0Q2j009631>