nicolasbock 14/08/20 18:22:23 Modified: lammps-20140815.ebuild ChangeLog Log: sci-physics/lammps-20140815: Fix linker error. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key AC91CA52)
Revision Changes Path 1.2 sci-physics/lammps/lammps-20140815.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild?r1=1.1&r2=1.2 Index: lammps-20140815.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lammps-20140815.ebuild 17 Aug 2014 23:52:33 -0000 1.1 +++ lammps-20140815.ebuild 20 Aug 2014 18:22:23 -0000 1.2 @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild,v 1.1 2014/08/17 23:52:33 nicolasbock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild,v 1.2 2014/08/20 18:22:23 nicolasbock Exp $ EAPI=5 -inherit eutils fortran-2 multilib +inherit eutils flag-o-matic fortran-2 multilib convert_month() { case $1 in @@ -67,7 +67,7 @@ CC=$(usex mpi "mpic++" "$(tc-getCXX)") \ F90=$(usex mpi "mpif90" "$(tc-getFC)") \ LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \ - CCFLAGS="${CXXFLAGS} -I../../src" \ + CCFLAGS="${CXXFLAGS}" \ F90FLAGS="${FCFLAGS}" \ LINKFLAGS="${LDFLAGS}" \ LMP_INC="${LAMMPS_INCLUDEFLAGS}" \ @@ -79,9 +79,6 @@ src_prepare() { # Fix inconsistent use of SHFLAGS. - sed -i -e 's:$(CCFLAGS):$(CCFLAGS) -fPIC:' src/STUBS/Makefile || die - sed -i -e 's:$(F90FLAGS):$(F90FLAGS) -fPIC:' lib/meam/Makefile.gfortran || die - sed -i -e 's:$(F90FLAGS):$(F90FLAGS) -fPIC:' lib/reax/Makefile.gfortran || die sed -i \ -e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \ -e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \ @@ -101,6 +98,10 @@ } src_compile() { + # Prepare compiler flags. + append-cxxflags -fPIC -I../../src + append-fflags -fPIC + # Compile stubs for serial version. use mpi || lmp_emake -C src stubs @@ -137,8 +138,11 @@ emake -C src yes-srd emake -C src yes-voronoi emake -C src yes-xtc - emake -C src yes-user-atc - lmp_emake -C lib/atc -f Makefile.g++ + + if use mpi; then + emake -C src yes-user-atc + lmp_emake -C lib/atc -f Makefile.g++ + fi if use static-libs; then # Build static library. 1.37 sci-physics/lammps/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/ChangeLog?rev=1.37&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/ChangeLog?rev=1.37&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/ChangeLog?r1=1.36&r2=1.37 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- ChangeLog 17 Aug 2014 23:52:33 -0000 1.36 +++ ChangeLog 20 Aug 2014 18:22:23 -0000 1.37 @@ -1,6 +1,9 @@ # ChangeLog for sci-physics/lammps # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v 1.36 2014/08/17 23:52:33 nicolasbock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v 1.37 2014/08/20 18:22:23 nicolasbock Exp $ + + 20 Aug 2014; Nicolas Bock <nicolasb...@gentoo.org> lammps-20140815.ebuild: + sci-physics/lammps-20140815: Fix linker error. *lammps-20140815 (17 Aug 2014)
