From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AA7F913877A for ; Thu, 24 Jul 2014 21:50:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAE9DE082D; Thu, 24 Jul 2014 21:50:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A6D90E07FB for ; Thu, 24 Jul 2014 21:50:10 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0669B33EB08 for ; Thu, 24 Jul 2014 21:50:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 9F5D51807D for ; Thu, 24 Jul 2014 21:50:08 +0000 (UTC) From: "Jens-Malte Gottfried" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jens-Malte Gottfried" Message-ID: <1406238572.eaa505b7fe3ae5a00cc9d99e1d8f4ab960e66610.jmg@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/petsc/files/, sci-mathematics/petsc/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/petsc/files/petsc-3.5.1-disable-rpath.patch sci-mathematics/petsc/metadata.xml sci-mathematics/petsc/petsc-3.5.1.ebuild X-VCS-Directories: sci-mathematics/petsc/files/ sci-mathematics/petsc/ X-VCS-Committer: jmg X-VCS-Committer-Name: Jens-Malte Gottfried X-VCS-Revision: eaa505b7fe3ae5a00cc9d99e1d8f4ab960e66610 X-VCS-Branch: master Date: Thu, 24 Jul 2014 21:50:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c6806a9a-d3db-4a56-9a1a-d1558fdeb2dc X-Archives-Hash: df1268f2515232cd889a6bc31514afc1 commit: eaa505b7fe3ae5a00cc9d99e1d8f4ab960e66610 Author: Jens Malte Gottfried web de> AuthorDate: Thu Jul 24 21:49:32 2014 +0000 Commit: Jens-Malte Gottfried godefridus de> CommitDate: Thu Jul 24 21:49:32 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=eaa505b7 petc-3.5.1 version bump --- .../petsc/files/petsc-3.5.1-disable-rpath.patch | 16 ++ sci-mathematics/petsc/metadata.xml | 4 +- sci-mathematics/petsc/petsc-3.5.1.ebuild | 234 +++++++++++++++++++++ 3 files changed, 251 insertions(+), 3 deletions(-) diff --git a/sci-mathematics/petsc/files/petsc-3.5.1-disable-rpath.patch b/sci-mathematics/petsc/files/petsc-3.5.1-disable-rpath.patch new file mode 100644 index 0000000..0ccf45d --- /dev/null +++ b/sci-mathematics/petsc/files/petsc-3.5.1-disable-rpath.patch @@ -0,0 +1,16 @@ +--- config/BuildSystem/config/setCompilers.py 2013-10-08 19:45:00.581513389 +0200 ++++ config/BuildSystem/config/setCompilers.py 2013-05-13 23:35:20.000000000 +0200 +@@ -1303,12 +1303,7 @@ + for language in languages: + flag = '-L' + self.pushLanguage(language) +- # test '-R' before '-rpath' as sun compilers [c,fortran] don't give proper errors with wrong options. +- if not Configure.isDarwin(): +- testFlags = ['-Wl,-rpath,', '-R','-rpath ' , '-Wl,-R,'] +- else: +- testFlags = [] +- # test '-R' before '-Wl,-rpath' for SUN compilers [as cc on linux accepts -Wl,-rpath, but f90 & CC do not. ++ testFlags = [] + if self.isSun(self.framework.getCompiler()): + testFlags.insert(0,'-R') + for testFlag in testFlags: diff --git a/sci-mathematics/petsc/metadata.xml b/sci-mathematics/petsc/metadata.xml index a22c6dc..fc9f3e8 100644 --- a/sci-mathematics/petsc/metadata.xml +++ b/sci-mathematics/petsc/metadata.xml @@ -4,14 +4,12 @@ sci-mathematics Use Afterstep image library (media-libs/libafterimage) + Use boost (dev-libs/boost) Use HYPRE (sci-mathematics/hypre) and for preconditioning Make scalars complex Use suitesparse (sci-libs/suitesparse) including cholmod (sci-libs/cholmod) for sparse factorization Use superlu (sci-libs/superlu) for preconditioning PLEASE FIX MY DESCRIPTION PLEASE FIX MY DESCRIPTION - diff --git a/sci-mathematics/petsc/petsc-3.5.1.ebuild b/sci-mathematics/petsc/petsc-3.5.1.ebuild new file mode 100644 index 0000000..e4ea76a --- /dev/null +++ b/sci-mathematics/petsc/petsc-3.5.1.ebuild @@ -0,0 +1,234 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit eutils flag-o-matic fortran-2 toolchain-funcs versionator + +MY_P="${PN}-$(replace_version_separator _ -)" + +DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation" +HOMEPAGE="http://www.mcs.anl.gov/petsc/" +SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${MY_P}.tar.gz" + +LICENSE="petsc" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="afterimage boost complex-scalars cxx debug doc fftw + fortran hdf5 hypre mpi mumps scotch sparse superlu threads X" +# Failed: imagemagick metis + +# hypre and superlu curretly exclude each other due to missing linking to hypre +# if both are enabled +REQUIRED_USE=" + afterimage? ( X ) + hdf5? ( mpi ) + hypre? ( cxx mpi ) + mumps? ( mpi scotch ) + scotch? ( mpi ) + ^^ ( hypre superlu ) +" +# imagemagick? ( X ) + +RDEPEND=" + virtual/blas + virtual/lapack + afterimage? ( media-libs/libafterimage ) + boost? ( dev-libs/boost ) + fftw? ( sci-libs/fftw[mpi?] ) + hdf5? ( sci-libs/hdf5[mpi?] ) + hypre? ( >=sci-libs/hypre-2.8.0b[mpi?] ) + mpi? ( virtual/mpi[cxx?,fortran?] ) + mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) + scotch? ( sci-libs/scotch[mpi?] ) + sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) + superlu? ( sci-libs/superlu ) + X? ( x11-libs/libX11 ) +" +# metis? ( sci-libs/parmetis ) +# imagemagick? ( media-gfx/imagemagick ) + +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/cmake +" +# cmake is used for parallel building +# in some configuration setups, legacy build is used (slow) + +# +# PETSc does not want its Makefiles to be invoked with anything higher than +# -j1. The underlying build system does automatically invoke a parallel +# build. This might not be what you want, but *hey* not your choice. +# +MAKEOPTS="${MAKEOPTS} -j1" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + epatch "${FILESDIR}"/${P%_*}-disable-rpath.patch +} + +src_configure() { + # petsc uses --with-blah=1 and --with-blah=0 to en/disable options + petsc_enable() { + use "$1" && echo "--with-${2:-$1}=1" || echo "--with-${2:-$1}=0" + } + # add external library: + # petsc_with use_flag libname libdir + # petsc_with use_flag libname include linking_libs + petsc_with() { + local myuse p=${2:-${1}} + if use ${1}; then + myuse="--with-${p}=1" + if [[ $# -ge 4 ]]; then + myuse="${myuse} --with-${p}-include=${EPREFIX}${3}" + shift 3 + myuse="${myuse} --with-${p}-lib=$@" + else + myuse="${myuse} --with-${p}-dir=${EPREFIX}${3:-/usr}" + fi + else + myuse="--with-${p}=0" + fi + echo ${myuse} + } + + # select between configure options depending on use flag + petsc_select() { + use "$1" && echo "--with-$2=$3" || echo "--with-$2=$4" + } + + local mylang + local myopt + + use cxx && mylang="cxx" || mylang="c" + use debug && myopt="debug" || myopt="opt" + + # environmental variables expected by petsc during build + export PETSC_DIR="${S}" + export PETSC_ARCH="linux-gnu-${mylang}-${myopt}" + + if use debug; then + strip-flags + filter-flags -O* + fi + + # C Support on Cxx builds is enabled if possible + # i.e. when not using complex scalars + # (no complex type for both available at the same time) + + # run petsc configure script + econf \ + scrollOutput=1 \ + CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + --with-shared-libraries \ + --with-single-library \ + --with-clanguage=${mylang} \ + $(use cxx && ! use complex-scalars && echo "with-c-support=1") \ + --with-petsc-arch=${PETSC_ARCH} \ + --with-precision=double \ + --with-gnu-compilers \ + --with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs lapack)" \ + $(petsc_enable debug debugging) \ + $(petsc_enable mpi) \ + $(petsc_select mpi cc mpicc $(tc-getCC)) \ + $(petsc_select mpi cxx mpicxx $(tc-getCXX)) \ + $(petsc_enable fortran) \ + $(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \ + $(petsc_enable mpi mpi-compilers) \ + $(petsc_select complex-scalars scalar-type complex real) \ + --with-windows-graphics=0 \ + --with-matlab=0 \ + --with-cmake=cmake \ + $(petsc_enable threads pthread) \ + $(petsc_with afterimage afterimage \ + /usr/include/libAfterImage -lAfterImage) \ + $(petsc_with hdf5) \ + $(petsc_with hypre hypre \ + /usr/include/hypre -lHYPRE) \ + $(petsc_with sparse suitesparse) \ + $(petsc_with superlu superlu \ + /usr/include/superlu -lsuperlu) \ + $(petsc_with X x) \ + $(petsc_with X x11) \ + $(petsc_with scotch ptscotch \ + /usr/include/scotch \ + [-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \ + $(petsc_with mumps scalapack \ + /usr/include/scalapack -lscalapack) \ + $(petsc_with mumps mumps \ + /usr/include \ + [-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \ + --with-imagemagick=0 \ + --with-python=0 \ + $(petsc_with boost) \ + $(petsc_with fftw) \ + +# not yet tested: +# python bindings, netcdf, fftw + +# failed dependencies, perhaps fixed in upstream soon: +# $(petsc_with metis parmetis) \ # needs metis too (>=5.0.2) +# $(petsc_with imagemagick imagemagick \ +# /usr/include/ImageMagick $($(tc-getPKG_CONFIG) --libs MagickCore)) \ +# $(petsc_enable threads pthreadclasses) \ +} + +src_install() { + # petsc install structure is very different from + # installing headers to /usr/include/petsc and lib to /usr/lib + # it also installs many unneeded executables and scripts + # so manual install is easier than cleanup after "emake install" + insinto /usr/include/${PN} + doins include/*.h* + insinto /usr/include/${PN}/${PETSC_ARCH}/include + doins ${PETSC_ARCH}/include/* + if use fortran; then + insinto /usr/include/${PN}/finclude + doins include/finclude/*.h + fi + if ! use mpi ; then + insinto /usr/include/${PN}/mpiuni + doins include/mpiuni/*.h + fi + insinto /usr/include/${PN}/conf + doins conf/{variables,rules,test} + insinto /usr/include/${PN}/${PETSC_ARCH}/conf + doins ${PETSC_ARCH}/conf/{petscrules,petscvariables,RDict.db} + insinto /usr/include/${PN}/petsc-private + doins include/petsc-private/*.h + + # fix configuration files: replace "${S}" by installed location + sed -i \ + -e "s:"${S}"::g" \ + "${ED}"/usr/include/${PN}/${PETSC_ARCH}/include/petscconf.h \ + "${ED}"/usr/include/${PN}/${PETSC_ARCH}/conf/petscvariables || die + sed -i \ + -e "s:usr/lib:usr/$(get_libdir):g" \ + "${ED}"/usr/include/${PN}/${PETSC_ARCH}/include/petscconf.h || die + + # add information about installation directory and + # PETSC_ARCH to environmental variables + cat >> 99petsc <<- EOF + PETSC_ARCH=${PETSC_ARCH} + PETSC_DIR=${EPREFIX}/usr/include/${PN} + EOF + doenvd 99petsc + + dolib.so ${PETSC_ARCH}/lib/*.so + + if use doc ; then + einfo "installing documentation (this could take a while)" + dodoc docs/manual.pdf + dohtml -r docs/*.html docs/changes docs/manualpages + fi +} + +pkg_postinst() { + elog "The petsc ebuild is still under development." + elog "Help us improve the ebuild in:" + elog "http://bugs.gentoo.org/show_bug.cgi?id=53386" +}