summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorQuinn <micheal.quinn85@gmail.com>2017-01-19 08:26:39 -0600
committerTodd Gamblin <tgamblin@llnl.gov>2017-01-19 06:26:39 -0800
commitf511f7b558c7cfe36265b9caf148808dcc849335 (patch)
treed6b95657472574e70e2a124eef432c325060446c /var
parent4dad5aab8402f787afd8f9e440ac4bbbecd4b80f (diff)
downloadspack-f511f7b558c7cfe36265b9caf148808dcc849335.tar.gz
spack-f511f7b558c7cfe36265b9caf148808dcc849335.tar.bz2
spack-f511f7b558c7cfe36265b9caf148808dcc849335.tar.xz
spack-f511f7b558c7cfe36265b9caf148808dcc849335.zip
Adding some fixes to packages that use `configure_args` function without setting spec set or directly referencing it (#2868)
* Adding 'self.' to the spec call for configure_args * Updating this to set spec to self.spec * More updates to the configure_args spec calls * Another spec issue * Another spec issue. * And another spec issue * Switching cmor back to self.spec.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/emacs/package.py1
-rw-r--r--var/spack/repos/builtin/packages/libcerf/package.py1
-rw-r--r--var/spack/repos/builtin/packages/libevent/package.py1
-rw-r--r--var/spack/repos/builtin/packages/libxml2/package.py1
4 files changed, 4 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py
index 0075c397b6..990ffd03cd 100644
--- a/var/spack/repos/builtin/packages/emacs/package.py
+++ b/var/spack/repos/builtin/packages/emacs/package.py
@@ -48,6 +48,7 @@ class Emacs(AutotoolsPackage):
depends_on('gtkplus+X', when='+X toolkit=gtk')
def configure_args(self):
+ spec = self.spec
args = []
toolkit = spec.variants['toolkit'].value
if '+X' in spec:
diff --git a/var/spack/repos/builtin/packages/libcerf/package.py b/var/spack/repos/builtin/packages/libcerf/package.py
index 3bc8ddbd16..82637431d6 100644
--- a/var/spack/repos/builtin/packages/libcerf/package.py
+++ b/var/spack/repos/builtin/packages/libcerf/package.py
@@ -38,6 +38,7 @@ class Libcerf(AutotoolsPackage):
version('1.3', 'b3504c467204df71e62aeccf73a25612')
def configure_args(self):
+ spec = self.spec
options = []
# Clang reports unused functions as errors, see
# http://clang.debian.net/status.php?version=3.8.1&key=UNUSED_FUNCTION
diff --git a/var/spack/repos/builtin/packages/libevent/package.py b/var/spack/repos/builtin/packages/libevent/package.py
index 86aeddaf20..415e905c12 100644
--- a/var/spack/repos/builtin/packages/libevent/package.py
+++ b/var/spack/repos/builtin/packages/libevent/package.py
@@ -53,6 +53,7 @@ class Libevent(AutotoolsPackage):
depends_on('openssl', when='+openssl')
def configure_args(self):
+ spec = self.spec
configure_args = []
if '+openssl' in spec:
configure_args.append('--enable-openssl')
diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py
index 29a83ee35e..470998d882 100644
--- a/var/spack/repos/builtin/packages/libxml2/package.py
+++ b/var/spack/repos/builtin/packages/libxml2/package.py
@@ -46,6 +46,7 @@ class Libxml2(AutotoolsPackage):
depends_on('pkg-config@0.9.0:', type='build')
def configure_args(self):
+ spec = self.spec
if '+python' in spec:
python_args = [
'--with-python={0}'.format(spec['python'].prefix),