* [gentoo-commits] gentoo-x86 commit in sci-physics/lammps: lammps-20140815.ebuild ChangeLog
@ 2014-08-20 23:11 Christoph Junghans (ottxor)
0 siblings, 0 replies; 3+ messages in thread
From: Christoph Junghans (ottxor) @ 2014-08-20 23:11 UTC (permalink / raw
To: gentoo-commits
ottxor 14/08/20 23:11:11
Modified: lammps-20140815.ebuild ChangeLog
Log:
fixed build with newer lapack/blas version
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Revision Changes Path
1.3 sci-physics/lammps/lammps-20140815.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild?r1=1.2&r2=1.3
Index: lammps-20140815.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lammps-20140815.ebuild 20 Aug 2014 18:22:23 -0000 1.2
+++ lammps-20140815.ebuild 20 Aug 2014 23:11:11 -0000 1.3
@@ -1,6 +1,6 @@
# 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.2 2014/08/20 18:22:23 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild,v 1.3 2014/08/20 23:11:11 ottxor Exp $
EAPI=5
@@ -49,7 +49,11 @@
IUSE="doc examples gzip lammps-memalign mpi static-libs"
DEPEND="
- mpi? ( virtual/mpi )
+ mpi? (
+ virtual/blas
+ virtual/lapack
+ virtual/mpi
+ )
sci-libs/voro++
"
RDEPEND="${DEPEND}"
@@ -74,6 +78,7 @@
MPI_INC=$(usex mpi '' "-I../STUBS") \
MPI_PATH=$(usex mpi '' '-L../STUBS') \
MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
+ user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
"$@"
}
1.38 sci-physics/lammps/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/ChangeLog?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/ChangeLog?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/ChangeLog?r1=1.37&r2=1.38
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog 20 Aug 2014 18:22:23 -0000 1.37
+++ ChangeLog 20 Aug 2014 23:11:11 -0000 1.38
@@ -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.37 2014/08/20 18:22:23 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v 1.38 2014/08/20 23:11:11 ottxor Exp $
+
+ 20 Aug 2014; Christoph Junghans <ottxor@gentoo.org> lammps-20140815.ebuild:
+ fixed build with newer lapack/blas version
20 Aug 2014; Nicolas Bock <nicolasbock@gentoo.org> lammps-20140815.ebuild:
sci-physics/lammps-20140815: Fix linker error.
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in sci-physics/lammps: lammps-20140815.ebuild ChangeLog
@ 2014-08-20 18:22 Nicolas Bock (nicolasbock)
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Bock (nicolasbock) @ 2014-08-20 18:22 UTC (permalink / raw
To: gentoo-commits
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 <nicolasbock@gentoo.org> lammps-20140815.ebuild:
+ sci-physics/lammps-20140815: Fix linker error.
*lammps-20140815 (17 Aug 2014)
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in sci-physics/lammps: lammps-20140815.ebuild ChangeLog
@ 2014-08-17 23:52 Nicolas Bock (nicolasbock)
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Bock (nicolasbock) @ 2014-08-17 23:52 UTC (permalink / raw
To: gentoo-commits
nicolasbock 14/08/17 23:52:33
Modified: ChangeLog
Added: lammps-20140815.ebuild
Log:
sci-physics/lammps-20140815: Added new version.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key AC91CA52)
Revision Changes Path
1.36 sci-physics/lammps/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/ChangeLog?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/ChangeLog?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/ChangeLog?r1=1.35&r2=1.36
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog 12 Aug 2014 12:51:36 -0000 1.35
+++ ChangeLog 17 Aug 2014 23:52:33 -0000 1.36
@@ -1,6 +1,11 @@
# 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.35 2014/08/12 12:51:36 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v 1.36 2014/08/17 23:52:33 nicolasbock Exp $
+
+*lammps-20140815 (17 Aug 2014)
+
+ 17 Aug 2014; Nicolas Bock <nicolasbock@gentoo.org> +lammps-20140815.ebuild:
+ sci-physics/lammps-20140815: Added new version.
*lammps-20140808 (12 Aug 2014)
1.1 sci-physics/lammps/lammps-20140815.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild?rev=1.1&content-type=text/plain
Index: lammps-20140815.ebuild
===================================================================
# 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 $
EAPI=5
inherit eutils fortran-2 multilib
convert_month() {
case $1 in
01) echo Jan
;;
02) echo Feb
;;
03) echo Mar
;;
04) echo Apr
;;
05) echo May
;;
06) echo Jun
;;
07) echo Jul
;;
08) echo Aug
;;
09) echo Sep
;;
10) echo Oct
;;
11) echo Nov
;;
12) echo Dec
;;
*) echo unknown
;;
esac
}
MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
HOMEPAGE="http://lammps.sandia.gov/"
SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc examples gzip lammps-memalign mpi static-libs"
DEPEND="
mpi? ( virtual/mpi )
sci-libs/voro++
"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
lmp_emake() {
local LAMMPS_INCLUDEFLAGS
LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"
# The lammps makefile uses CC to indicate the C++ compiler.
emake \
ARCHIVE=$(tc-getAR) \
CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
F90=$(usex mpi "mpif90" "$(tc-getFC)") \
LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
CCFLAGS="${CXXFLAGS} -I../../src" \
F90FLAGS="${FCFLAGS}" \
LINKFLAGS="${LDFLAGS}" \
LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
MPI_INC=$(usex mpi '' "-I../STUBS") \
MPI_PATH=$(usex mpi '' '-L../STUBS') \
MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
"$@"
}
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 =:' \
src/VORONOI/Makefile.lammps || die
# Fix missing .so name.
sed -i \
-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
src/MAKE/Makefile.serial || die
# Fix makefile in tools.
sed -i \
-e 's:g++:$(CXX) $(CXXFLAGS):' \
-e 's:gcc:$(CC) $(CCFLAGS):' \
-e 's:ifort:$(FC) $(FCFLAGS):' \
tools/Makefile || die
}
src_compile() {
# Compile stubs for serial version.
use mpi || lmp_emake -C src stubs
# Build packages
emake -C src yes-asphere
emake -C src yes-body
emake -C src yes-class2
emake -C src yes-colloid
emake -C src yes-dipole
emake -C src yes-fld
#emake -C src yes-gpu
emake -C src yes-granular
# Need OpenKIM external dependency.
#emake -C src yes-kim
# Need Kokkos external dependency.
#emake -C src yes-kokkos
emake -C src yes-kspace
emake -C src yes-manybody
emake -C src yes-mc
lmp_emake -C src yes-meam
lmp_emake -j1 -C lib/meam -f Makefile.gfortran
emake -C src yes-misc
emake -C src yes-molecule
#emake -C src yes-mpiio
emake -C src yes-opt
emake -C src yes-peri
emake -C src yes-poems
lmp_emake -C lib/poems -f Makefile.g++
emake -C src yes-reax
lmp_emake -j1 -C lib/reax -f Makefile.gfortran
emake -C src yes-replica
emake -C src yes-rigid
emake -C src yes-shock
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 static-libs; then
# Build static library.
lmp_emake -C src makelib
lmp_emake -C src -f Makefile.lib serial
fi
# Build shared library.
lmp_emake -C src makeshlib
lmp_emake -C src -f Makefile.shlib serial
# Compile main executable.
lmp_emake -C src serial
# Compile tools.
emake -C tools binary2txt chain micelle2d data2xmovie
}
src_install() {
use static-libs && newlib.a src/liblammps_serial.a liblammps.a
newlib.so src/liblammps_serial.so liblammps.so.0.0.0
dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
newbin src/lmp_serial lmp
dobin tools/binary2txt
# Don't forget to add header files of optional packages as they are added
# to this ebuild. There may also be .mod files from Fortran based
# packages.
insinto "/usr/include/${PN}"
doins -r src/*.h lib/meam/*.mod
local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
insinto "/${LAMMPS_POTENTIALS}"
doins potentials/*
echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
doenvd 99lammps
if use examples; then
local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
insinto "${LAMMPS_EXAMPLES}"
doins -r examples/*
fi
dodoc README
if use doc; then
dodoc doc/Manual.pdf
dohtml -r doc/*
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-08-20 23:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-20 23:11 [gentoo-commits] gentoo-x86 commit in sci-physics/lammps: lammps-20140815.ebuild ChangeLog Christoph Junghans (ottxor)
-- strict thread matches above, loose matches on Subject: below --
2014-08-20 18:22 Nicolas Bock (nicolasbock)
2014-08-17 23:52 Nicolas Bock (nicolasbock)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox