From d5ff7fda6ec26df1e574ef9fc38ffc082ec2daca Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Fri, 8 Jan 2016 22:41:18 -0500 Subject: Ensure the APPS environment variable is not set when building OpenSSL --- var/spack/packages/openssl/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/packages/openssl/package.py b/var/spack/packages/openssl/package.py index a24de20cc3..36b63e1262 100644 --- a/var/spack/packages/openssl/package.py +++ b/var/spack/packages/openssl/package.py @@ -17,6 +17,10 @@ class Openssl(Package): parallel = False def install(self, spec, prefix): + # OpenSSL uses a variable APPS in its Makefile. If it happens to be set + # in the environment, then this will override what is set in the + # Makefile, leading to build errors. + del env['APPS'] if spec.satisfies("=darwin-x86_64") or spec.satisfies("=ppc64"): # This needs to be done for all 64-bit architectures (except Linux, # where it happens automatically?) -- cgit v1.2.3-70-g09d2 From 8af8c105597f3bdeb999e288f8201612d6756788 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Mon, 11 Jan 2016 17:33:44 -0500 Subject: Avoid key error when env var is unset --- var/spack/packages/openssl/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/packages/openssl/package.py b/var/spack/packages/openssl/package.py index 36b63e1262..bbb169ec6b 100644 --- a/var/spack/packages/openssl/package.py +++ b/var/spack/packages/openssl/package.py @@ -20,7 +20,7 @@ class Openssl(Package): # OpenSSL uses a variable APPS in its Makefile. If it happens to be set # in the environment, then this will override what is set in the # Makefile, leading to build errors. - del env['APPS'] + env.pop('APPS', None) if spec.satisfies("=darwin-x86_64") or spec.satisfies("=ppc64"): # This needs to be done for all 64-bit architectures (except Linux, # where it happens automatically?) -- cgit v1.2.3-70-g09d2