From 0f427ed334f8a58e888872d60419709cfd6f41c3 Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Tue, 10 May 2016 01:07:17 -0700
Subject: [PATCH] Tweak nccmp to be more spack-compatible.
- Spack doesn't set F90, but it confuses the nccmp build. Just remove
it from the environment.
- TODO: should build environment unset this variable?
---
var/spack/repos/builtin/packages/nccmp/package.py | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/var/spack/repos/builtin/packages/nccmp/package.py b/var/spack/repos/builtin/packages/nccmp/package.py
index 458afbb1e8..72e86831c6 100644
--- a/var/spack/repos/builtin/packages/nccmp/package.py
+++ b/var/spack/repos/builtin/packages/nccmp/package.py
@@ -1,5 +1,4 @@
from spack import *
-import os
class Nccmp(Package):
"""Compare NetCDF Files"""
@@ -15,16 +14,10 @@ def install(self, spec, prefix):
# FCFLAGS respectively in this configure, please unset
# F90/F90FLAGS and set FC/FCFLAGS instead and rerun configure
# again.
- os.environ['FC'] = os.environ['F90']
- del os.environ['F90']
- try:
- os.environ['FCFLAGS'] = os.environ['F90FLAGS']
- del os.environ['F90FLAGS']
- except KeyError: # There are no flags
- pass
+ env.pop('F90', None)
+ env.pop('F90FLAGS', None)
configure('--prefix=%s' % prefix)
-
make()
make("check")
make("install")
--
GitLab