diff options
Diffstat (limited to 'var')
4 files changed, 9 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/bison/package.py b/var/spack/repos/builtin/packages/bison/package.py index ac920b96aa..8a2d4a111b 100644 --- a/var/spack/repos/builtin/packages/bison/package.py +++ b/var/spack/repos/builtin/packages/bison/package.py @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from spack.operating_systems.mac_os import macOS_version +from spack.operating_systems.mac_os import macos_version import sys @@ -42,7 +42,7 @@ class Bison(AutotoolsPackage): patch('pgi.patch', when='@3.0.4') - if sys.platform == 'darwin' and macOS_version() >= Version('10.13'): + if sys.platform == 'darwin' and macos_version() >= Version('10.13'): patch('secure_snprintf.patch', level=0, when='@3.0.4') build_directory = 'spack-build' diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index fb176edcff..13f7e1abf8 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from spack.operating_systems.mac_os import macOS_version +from spack.operating_systems.mac_os import macos_version from llnl.util import tty import glob @@ -157,7 +157,7 @@ class Gcc(AutotoolsPackage): if sys.platform == 'darwin': # Fix parallel build on APFS filesystem # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81797 - if macOS_version() >= Version('10.13'): + if macos_version() >= Version('10.13'): patch('darwin/apfs.patch', when='@5.5.0,6.1:6.4,7.1:7.3') # from homebrew via macports # https://trac.macports.org/ticket/56502#no1 diff --git a/var/spack/repos/builtin/packages/oce/package.py b/var/spack/repos/builtin/packages/oce/package.py index 45758d6924..6b7b3349bd 100644 --- a/var/spack/repos/builtin/packages/oce/package.py +++ b/var/spack/repos/builtin/packages/oce/package.py @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from spack.operating_systems.mac_os import macOS_version +from spack.operating_systems.mac_os import macos_version import platform @@ -68,7 +68,7 @@ class Oce(Package): # fix build with Xcode 8 "previous definition of CLOCK_REALTIME" # reported 27 Sep 2016 https://github.com/tpaviot/oce/issues/643 if (platform.system() == "Darwin") and ( - macOS_version() == Version('10.12')): + macos_version() == Version('10.12')): patch('sierra.patch', when='@0.17.2:0.18.0') def install(self, spec, prefix): @@ -99,7 +99,7 @@ class Oce(Package): ]) if platform.system() == 'Darwin' and ( - macOS_version() >= Version('10.12')): + macos_version() >= Version('10.12')): # use @rpath on Sierra due to limit of dynamic loader options.append('-DCMAKE_MACOSX_RPATH=ON') else: diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 7854226079..9cce2f028e 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -25,7 +25,7 @@ import os import sys from spack import * -from spack.operating_systems.mac_os import macOS_version +from spack.operating_systems.mac_os import macos_version # Trilinos is complicated to build, as an inspiration a couple of links to # other repositories which build it: @@ -703,7 +703,7 @@ class Trilinos(CMakePackage): '-DTrilinos_ENABLE_FEI=OFF' ]) - if sys.platform == 'darwin' and macOS_version() >= Version('10.12'): + if sys.platform == 'darwin' and macos_version() >= Version('10.12'): # use @rpath on Sierra due to limit of dynamic loader options.append('-DCMAKE_MACOSX_RPATH=ON') else: |