summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Rood <jon.rood@nrel.gov>2018-11-27 16:55:21 -0700
committerChristoph Junghans <christoph.junghans@gmail.com>2018-11-27 16:55:21 -0700
commit4c3091b05ee37d0a72f41bd330e0f442bf49a734 (patch)
tree31664086fd904ad24396dde7886ec0ed0d2b9305
parent2164181d0a3509c1fe42a44484e6a012036e9580 (diff)
downloadspack-4c3091b05ee37d0a72f41bd330e0f442bf49a734.tar.gz
spack-4c3091b05ee37d0a72f41bd330e0f442bf49a734.tar.bz2
spack-4c3091b05ee37d0a72f41bd330e0f442bf49a734.tar.xz
spack-4c3091b05ee37d0a72f41bd330e0f442bf49a734.zip
Fixing problems with lammps dependencies voropp and latte (#9909)
* Fixing problems with lammps dependencies voropp and latte. * Always replacing CFLAGS in voropp and specifying voropp+pic dependency in lammps.
-rw-r--r--var/spack/repos/builtin/packages/lammps/package.py2
-rw-r--r--var/spack/repos/builtin/packages/latte/package.py2
-rw-r--r--var/spack/repos/builtin/packages/voropp/package.py11
3 files changed, 13 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py
index 4f593652f7..e33460c09d 100644
--- a/var/spack/repos/builtin/packages/lammps/package.py
+++ b/var/spack/repos/builtin/packages/lammps/package.py
@@ -59,7 +59,7 @@ class Lammps(CMakePackage):
depends_on('mpi', when='+mpi')
depends_on('mpi', when='+mpiio')
depends_on('fftw', when='+kspace')
- depends_on('voropp', when='+voronoi')
+ depends_on('voropp+pic', when='+voronoi')
depends_on('netcdf+mpi', when='+user-netcdf')
depends_on('blas', when='+user-atc')
depends_on('lapack', when='+user-atc')
diff --git a/var/spack/repos/builtin/packages/latte/package.py b/var/spack/repos/builtin/packages/latte/package.py
index fe7b75b8a8..836aff2b98 100644
--- a/var/spack/repos/builtin/packages/latte/package.py
+++ b/var/spack/repos/builtin/packages/latte/package.py
@@ -17,7 +17,7 @@ class Latte(CMakePackage):
tags = ['ecp', 'ecp-apps']
version('develop', branch='master')
- version('1.2.1', '56db44afaba2a89e6ca62ac565c3c012')
+ version('1.2.1', '9a0690bf4e0e1cab057475a67052b0a8')
version('1.2.0', 'b9bf8f84a0e0cf7b0e278a1bc7751b3d')
version('1.1.1', 'ab11867ba6235189681cf6e50a50cc50')
version('1.0.1', 'd0b99edbcf7a19abe0a68a192d6f6234')
diff --git a/var/spack/repos/builtin/packages/voropp/package.py b/var/spack/repos/builtin/packages/voropp/package.py
index e0a63f6f8e..872a23cfce 100644
--- a/var/spack/repos/builtin/packages/voropp/package.py
+++ b/var/spack/repos/builtin/packages/voropp/package.py
@@ -14,6 +14,9 @@ class Voropp(MakefilePackage):
homepage = "http://math.lbl.gov/voro++/about.html"
url = "http://math.lbl.gov/voro++/download/dir/voro++-0.4.6.tar.gz"
+ variant('pic', default=True,
+ description='Position independent code')
+
version('0.4.6', '2338b824c3b7b25590e18e8df5d68af9')
def edit(self, spec, prefix):
@@ -23,3 +26,11 @@ class Voropp(MakefilePackage):
filter_file(r'PREFIX=/usr/local',
'PREFIX={0}'.format(self.prefix),
'config.mk')
+ # We can safely replace the default CFLAGS which are:
+ # CFLAGS=-Wall -ansi -pedantic -O3
+ cflags = ''
+ if '+pic' in spec:
+ cflags += self.compiler.pic_flag
+ filter_file(r'CFLAGS=.*',
+ 'CFLAGS={0}'.format(cflags),
+ 'config.mk')