summaryrefslogtreecommitdiff
path: root/var/spack/repos/builtin/packages/py-numpy
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2019-07-29 17:05:02 -0500
committerPeter Scheibel <scheibel1@llnl.gov>2019-07-29 15:05:02 -0700
commit9af155f0f689e0ede85fe2f3fe468c2eb64027f2 (patch)
treee5411c8a43acda91fe5a18c121c69a442420aaec /var/spack/repos/builtin/packages/py-numpy
parente7d9a6f426b17774fd6f716384577d83d2263fd0 (diff)
downloadspack-9af155f0f689e0ede85fe2f3fe468c2eb64027f2.tar.gz
spack-9af155f0f689e0ede85fe2f3fe468c2eb64027f2.tar.bz2
spack-9af155f0f689e0ede85fe2f3fe468c2eb64027f2.tar.xz
spack-9af155f0f689e0ede85fe2f3fe468c2eb64027f2.zip
Fix some Mac constraint checks (#12138)
* Fix Mac platform check for dependency in py-ipython package: 'when' constraints in Spack directives must be Specs (either a Spec object or a Spec in string format) * Fix Mac version check in py-numpy: platform.mac_ver() returns a 3-part string as its first tuple item so the check as written would never pass; use Spack Version object to simplify check. * Fix Mac version check in qt package (the check was incorrectly comparing ints and strings) and use Spack version object to simplify check.
Diffstat (limited to 'var/spack/repos/builtin/packages/py-numpy')
-rw-r--r--var/spack/repos/builtin/packages/py-numpy/package.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py
index e4385985f7..dd3f2507e3 100644
--- a/var/spack/repos/builtin/packages/py-numpy/package.py
+++ b/var/spack/repos/builtin/packages/py-numpy/package.py
@@ -84,7 +84,8 @@ class PyNumpy(PythonPackage):
def write_library_dirs(f, dirs):
f.write('library_dirs=%s\n' % dirs)
if not ((platform.system() == "Darwin") and
- (platform.mac_ver()[0] == '10.12')):
+ (Version(platform.mac_ver()[0]).up_to(2) == Version(
+ '10.12'))):
f.write('rpath=%s\n' % dirs)
# for build notes see http://www.scipy.org/scipylib/building/linux.html