From 14076c52f13977381b273e433c0e5de82b9fe28c Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Fri, 11 Aug 2017 15:24:40 -0700 Subject: packages need to reference self.spec instead of spec (#5075) --- var/spack/repos/builtin/packages/callpath/package.py | 2 +- var/spack/repos/builtin/packages/kealib/package.py | 4 ++-- var/spack/repos/builtin/packages/llvm-lld/package.py | 4 ++-- var/spack/repos/builtin/packages/magics/package.py | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/callpath/package.py b/var/spack/repos/builtin/packages/callpath/package.py index ef2058f557..bc72bb50bd 100644 --- a/var/spack/repos/builtin/packages/callpath/package.py +++ b/var/spack/repos/builtin/packages/callpath/package.py @@ -46,7 +46,7 @@ class Callpath(CMakePackage): # TODO: offer options for the walker used. args = ["-DCALLPATH_WALKER=dyninst"] - if spec.satisfies("^dyninst@9.3.0:"): + if self.spec.satisfies("^dyninst@9.3.0:"): std_flag = self.compiler.cxx11_flag args.append("-DCMAKE_CXX_FLAGS='{0} -fpermissive'".format( std_flag)) diff --git a/var/spack/repos/builtin/packages/kealib/package.py b/var/spack/repos/builtin/packages/kealib/package.py index 6abc7c643f..296090ef28 100644 --- a/var/spack/repos/builtin/packages/kealib/package.py +++ b/var/spack/repos/builtin/packages/kealib/package.py @@ -53,6 +53,6 @@ class Kealib(CMakePackage): def cmake_args(self): return [ - '-DHDF5_INCLUDE_DIR=%s' % spec['hdf5'].prefix.include, - '-DHDF5_LIB_PATH=%s' % spec['hdf5'].prefix.lib, + '-DHDF5_INCLUDE_DIR=%s' % self.spec['hdf5'].prefix.include, + '-DHDF5_LIB_PATH=%s' % self.spec['hdf5'].prefix.lib, ] diff --git a/var/spack/repos/builtin/packages/llvm-lld/package.py b/var/spack/repos/builtin/packages/llvm-lld/package.py index 801c384c79..5619f1132d 100644 --- a/var/spack/repos/builtin/packages/llvm-lld/package.py +++ b/var/spack/repos/builtin/packages/llvm-lld/package.py @@ -43,6 +43,6 @@ class LlvmLld(CMakePackage): env['CXXFLAGS'] = self.compiler.cxx11_flag return [ - '-DLLD_PATH_TO_LLVM_BUILD=%s' % spec['llvm'].prefix, - '-DLLVM_MAIN_SRC_DIR=%s' % spec['llvm'].prefix, + '-DLLD_PATH_TO_LLVM_BUILD=%s' % self.spec['llvm'].prefix, + '-DLLVM_MAIN_SRC_DIR=%s' % self.spec['llvm'].prefix, ] diff --git a/var/spack/repos/builtin/packages/magics/package.py b/var/spack/repos/builtin/packages/magics/package.py index 4eac010c18..426695a3dd 100644 --- a/var/spack/repos/builtin/packages/magics/package.py +++ b/var/spack/repos/builtin/packages/magics/package.py @@ -84,6 +84,7 @@ class Magics(CMakePackage): filter_file('#!/usr/bin/python', '#!/usr/bin/env python', pyfile) def cmake_args(self): + spec = self.spec args = [ '-DENABLE_ODB=OFF', '-DENABLE_PYTHON=OFF', -- cgit v1.2.3-60-g2f50