Gentoo Archives: gentoo-commits

From: Nicolas Bock <nicolasbock@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/lammps/
Date: Wed, 28 Oct 2015 19:27:09
Message-Id: 1446060297.773a7b8c58d010078f1ac85a9b9921a373d2c7e5.nicolasbock@gentoo
1 commit: 773a7b8c58d010078f1ac85a9b9921a373d2c7e5
2 Author: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 28 19:21:31 2015 +0000
4 Commit: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 28 19:24:57 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=773a7b8c
7
8 sci-physics/lammps: Ebuild cleanup
9
10 Package-Manager: portage-2.2.20.1
11
12 sci-physics/lammps/lammps-20151026.ebuild | 68 +++++++++----------------------
13 1 file changed, 20 insertions(+), 48 deletions(-)
14
15 diff --git a/sci-physics/lammps/lammps-20151026.ebuild b/sci-physics/lammps/lammps-20151026.ebuild
16 index 2c75712..55f834d 100644
17 --- a/sci-physics/lammps/lammps-20151026.ebuild
18 +++ b/sci-physics/lammps/lammps-20151026.ebuild
19 @@ -47,64 +47,36 @@ lmp_emake() {
20
21 # The lammps makefile uses CC to indicate the C++ compiler.
22 emake \
23 - ARCHIVE=$(tc-getAR) \
24 - CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
25 - F90=$(usex mpi "mpif90" "$(tc-getFC)") \
26 - LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
27 + ARCHIVE="$(tc-getAR)" \
28 + CC="$(usex mpi "mpic++" "$(tc-getCXX)")" \
29 + F90="$(usex mpi "mpif90" "$(tc-getFC)")" \
30 + LINK="$(usex mpi "mpic++" "$(tc-getCXX)")" \
31 CCFLAGS="${CXXFLAGS}" \
32 F90FLAGS="${FCFLAGS}" \
33 LINKFLAGS="${LDFLAGS}" \
34 LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
35 - MPI_INC=$(usex mpi "" "-I../STUBS") \
36 - MPI_PATH=$(usex mpi "" "-L../STUBS") \
37 - MPI_LIB=$(usex mpi "" "-lmpi_stubs") \
38 + MPI_INC="$(usex mpi "" "-I../STUBS")" \
39 + MPI_PATH="$(usex mpi "" "-L../STUBS")" \
40 + MPI_LIB="$(usex mpi "" "-lmpi_stubs")" \
41 user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
42 "$@"
43 }
44
45 lmp_activate_packages() {
46 # Build packages
47 - lmp_emake -C src yes-asphere
48 - lmp_emake -C src yes-body
49 - lmp_emake -C src yes-class2
50 - lmp_emake -C src yes-colloid
51 - lmp_emake -C src yes-coreshell
52 - lmp_emake -C src yes-dipole
53 - lmp_emake -C src yes-fld
54 - #lmp_emake -C src yes-gpu
55 - lmp_emake -C src yes-granular
56 - # Need OpenKIM external dependency.
57 - #lmp_emake -C src yes-kim
58 - # Need Kokkos external dependency.
59 - #lmp_emake -C src yes-kokkos
60 - lmp_emake -C src yes-kspace
61 - lmp_emake -C src yes-manybody
62 - lmp_emake -C src yes-mc
63 - lmp_emake -C src yes-meam
64 - lmp_emake -C src yes-misc
65 - lmp_emake -C src yes-molecule
66 - #lmp_emake -C src yes-mpiio
67 - lmp_emake -C src yes-opt
68 - lmp_emake -C src yes-peri
69 - lmp_emake -C src yes-poems
70 - lmp_emake -C src yes-qeq
71 - lmp_emake -C src yes-reax
72 - lmp_emake -C src yes-replica
73 - lmp_emake -C src yes-rigid
74 - lmp_emake -C src yes-shock
75 - lmp_emake -C src yes-snap
76 - lmp_emake -C src yes-srd
77 - lmp_emake -C src yes-voronoi
78 - lmp_emake -C src yes-xtc
79 -
80 - if use mpi; then
81 - lmp_emake -C src yes-user-atc
82 - fi
83 - lmp_emake -C src yes-user-eff
84 - lmp_emake -C src yes-user-fep
85 - use mpi && lmp_emake -C src yes-user-lb
86 - lmp_emake -C src yes-user-phonon
87 - lmp_emake -C src yes-user-sph
88 + local packages=( yes-asphere yes-body yes-class2 yes-colloid \
89 + yes-coreshell yes-dipole yes-fld yes-granular yes-kspace \
90 + yes-manybody yes-mc yes-meam yes-misc \
91 + $(usex mpi "yes-user-atc" "") \
92 + yes-molecule yes-opt yes-peri yes-poems yes-qeq yes-reax \
93 + yes-replica yes-rigid yes-shock yes-snap yes-srd \
94 + yes-user-eff yes-user-fep \
95 + $(usex mpi "yes-user-lb" "") \
96 + yes-user-phonon yes-user-sph yes-voronoi yes-xtc )
97 +
98 + for p in ${packages[@]}; do
99 + lmp_emake -C src ${p}
100 + done
101 }
102
103 lmp_build_packages() {