diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2019-07-29 17:05:02 -0500 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2019-07-29 15:05:02 -0700 |
| commit | 9af155f0f689e0ede85fe2f3fe468c2eb64027f2 (patch) | |
| tree | e5411c8a43acda91fe5a18c121c69a442420aaec /var | |
| parent | e7d9a6f426b17774fd6f716384577d83d2263fd0 (diff) | |
| download | spack-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')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-ipython/package.py | 7 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-numpy/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py index b26fa7713e..3efd37b0ec 100644 --- a/var/spack/repos/builtin/packages/py-ipython/package.py +++ b/var/spack/repos/builtin/packages/py-ipython/package.py @@ -4,8 +4,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * -import sys -import platform class PyIpython(PythonPackage): @@ -32,9 +30,6 @@ class PyIpython(PythonPackage): depends_on('py-decorator', type=('build', 'run')) depends_on('py-pexpect', type=('build', 'run')) depends_on('py-backcall', type=('build', 'run'), when="^python@3.3:") - - depends_on('py-appnope', type=('build', 'run'), - when=sys.platform == 'darwin' and - int(platform.mac_ver()[0].split('.')[1]) >= 9) + depends_on('py-appnope', type=('build', 'run'), when='platform=darwin') conflicts('^python@2.7:2.8', when='@7.0.0:') 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 diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 4506dcd0a3..59c80c521f 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -320,8 +320,8 @@ class Qt(Package): if '@4' in self.spec and sys.platform == 'darwin': config_args.append('-cocoa') - mac_ver = tuple(platform.mac_ver()[0].split('.')[:2]) - sdkname = 'macosx%s' % '.'.join(mac_ver) + mac_ver = Version(platform.mac_ver()[0]) + sdkname = 'macosx{0}'.format(mac_ver.up_to(2)) sdkpath = which('xcrun')('--show-sdk-path', '--sdk', sdkname, output=str) @@ -338,7 +338,7 @@ class Qt(Package): use_clang_platform = True if use_clang_platform: config_args.append('-platform') - if mac_ver >= (10, 9): + if mac_ver >= Version('10.9'): config_args.append('unsupported/macx-clang-libc++') else: config_args.append('unsupported/macx-clang') |