diff options
| author | Choong Jun Jin <zepxhube@gmail.com> | 2017-11-27 15:50:26 +0200 |
|---|---|---|
| committer | Christoph Junghans <christoph.junghans@gmail.com> | 2017-11-27 06:50:26 -0700 |
| commit | 45e15621620bb22ce1b54a38db6002153cac0696 (patch) | |
| tree | 8f91453f31d3ea9a10de79eaf90c3d3c7bd6b7f6 | |
| parent | eacaa1551ee0f66ade48296bd79046ab07028595 (diff) | |
| download | spack-45e15621620bb22ce1b54a38db6002153cac0696.tar.gz spack-45e15621620bb22ce1b54a38db6002153cac0696.tar.bz2 spack-45e15621620bb22ce1b54a38db6002153cac0696.tar.xz spack-45e15621620bb22ce1b54a38db6002153cac0696.zip | |
fixed glog compilation for < 0.3.5 (#6463)
| -rw-r--r-- | var/spack/repos/builtin/packages/glog/package.py | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/glog/package.py b/var/spack/repos/builtin/packages/glog/package.py index cc62b1250e..57adf51fde 100644 --- a/var/spack/repos/builtin/packages/glog/package.py +++ b/var/spack/repos/builtin/packages/glog/package.py @@ -25,16 +25,30 @@ from spack import * -class Glog(CMakePackage): +class Glog(Package): """C++ implementation of the Google logging module.""" homepage = "https://github.com/google/glog" - url = "https://github.com/google/glog/archive/v0.3.4.tar.gz" + url = "https://github.com/google/glog/archive/v0.3.5.tar.gz" + version('0.3.5', '5df6d78b81e51b90ac0ecd7ed932b0d4') version('0.3.4', 'df92e05c9d02504fb96674bc776a41cb') version('0.3.3', 'c1f86af27bd9c73186730aa957607ed0') depends_on('gflags') + depends_on('cmake', when="@0.3.5:") - def cmake_args(self): - return ['-DBUILD_SHARED_LIBS=TRUE'] + def install(self, spec, prefix): + configure('--prefix=%s' % prefix) + make + make('install') + + @when('@0.3.5:') + def install(self, spec, prefix): + cmake_args = ['-DBUILD_SHARED_LIBS=TRUE'] + cmake_args.extend(std_cmake_args) + + with working_dir('spack-build', create=True): + cmake('..', *cmake_args) + make + make('install') |