libxc: update URL / new API (#13471)
- setup_environment -> setup_build_environment - remove patch
This commit is contained in:
parent
2cea0633fa
commit
854f45a136
@ -1,21 +0,0 @@
|
||||
--- libxc-4.3.2/configure 2019-02-08 17:40:50.000000000 +0900
|
||||
+++ libxc-4.3.2/configure_b 2019-07-25 14:48:51.825394300 +0900
|
||||
@@ -14405,6 +14405,18 @@
|
||||
lt_prog_compiler_pic_FC='-qpic'
|
||||
lt_prog_compiler_static_FC='-qstaticlink'
|
||||
;;
|
||||
+ fcc* | FCC* )
|
||||
+ # Fujitsu C/C++ compiler
|
||||
+ lt_prog_compiler_wl_FC='-Wl,'
|
||||
+ lt_prog_compiler_pic_FC='-KPIC'
|
||||
+ lt_prog_compiler_static_FC='-Bstatic'
|
||||
+ ;;
|
||||
+ frt* )
|
||||
+ # Fujitsu Fortran compiler
|
||||
+ lt_prog_compiler_wl_FC='-Wl,'
|
||||
+ lt_prog_compiler_pic_FC='-KPIC'
|
||||
+ lt_prog_compiler_static_FC='-Kstatic_fjlib'
|
||||
+ ;;
|
||||
*)
|
||||
case `$CC -V 2>&1 | sed 5q` in
|
||||
*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
|
@ -10,8 +10,8 @@ class Libxc(AutotoolsPackage):
|
||||
"""Libxc is a library of exchange-correlation functionals for
|
||||
density-functional theory."""
|
||||
|
||||
homepage = "http://www.tddft.org/programs/octopus/wiki/index.php/Libxc"
|
||||
url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/libxc-2.2.2.tar.gz"
|
||||
homepage = "https://tddft.org/programs/libxc/"
|
||||
url = "https://www.tddft.org/programs/libxc/down.php?file=2.2.2/libxc-2.2.2.tar.gz"
|
||||
|
||||
version('4.3.2', sha256='bc159aea2537521998c7fb1199789e1be71e04c4b7758d58282622e347603a6f')
|
||||
version('4.2.3', sha256='02e49e9ba7d21d18df17e9e57eae861e6ce05e65e966e1e832475aa09e344256')
|
||||
@ -19,18 +19,6 @@ class Libxc(AutotoolsPackage):
|
||||
version('2.2.2', sha256='6ca1d0bb5fdc341d59960707bc67f23ad54de8a6018e19e02eee2b16ea7cc642')
|
||||
version('2.2.1', sha256='ade61c1fa4ed238edd56408fd8ee6c2e305a3d5753e160017e2a71817c98fd00')
|
||||
|
||||
patch('configure_add_fj.patch')
|
||||
|
||||
def url_for_version(self, version):
|
||||
if version < Version('3.0.0'):
|
||||
return ("http://www.tddft.org/programs/octopus/"
|
||||
"down.php?file=libxc/libxc-{0}.tar.gz"
|
||||
.format(version))
|
||||
|
||||
return ("http://www.tddft.org/programs/octopus/"
|
||||
"down.php?file=libxc/{0}/libxc-{0}.tar.gz"
|
||||
.format(version))
|
||||
|
||||
@property
|
||||
def libs(self):
|
||||
"""Libxc can be queried for the following parameters:
|
||||
@ -61,7 +49,7 @@ def libs(self):
|
||||
libraries, root=self.prefix, shared=shared, recursive=True
|
||||
)
|
||||
|
||||
def setup_environment(self, spack_env, run_env):
|
||||
def setup_build_environment(self, spack_env):
|
||||
optflags = '-O2'
|
||||
if self.compiler.name == 'intel':
|
||||
# Optimizations for the Intel compiler, suggested by CP2K
|
||||
|
Loading…
Reference in New Issue
Block a user