From db794ea2016b831c49cde00c66863ddb0eba7e14 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 1 Oct 2020 17:06:04 -0500 Subject: p7zip: fix build on macOS --- var/spack/repos/builtin/packages/p7zip/package.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/p7zip/package.py b/var/spack/repos/builtin/packages/p7zip/package.py index 0f13335ae6..5a0728eb29 100644 --- a/var/spack/repos/builtin/packages/p7zip/package.py +++ b/var/spack/repos/builtin/packages/p7zip/package.py @@ -3,8 +3,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * - class P7zip(MakefilePackage): """A Unix port of the 7z file archiver""" @@ -17,6 +15,13 @@ class P7zip(MakefilePackage): # all3 includes 7z, 7za, and 7zr build_targets = ['all3'] + def edit(self, spec, prefix): + if 'platform=darwin' in self.spec: + if '%gcc' in self.spec: + copy('makefile.macosx_gcc_64bits', 'makefile.machine') + elif '%apple-clang' in self.spec or '%clang' in self.spec: + copy('makefile.macosx_llvm_64bits', 'makefile.machine') + @property def install_targets(self): return ['DEST_HOME={0}'.format(self.prefix), 'install'] -- cgit v1.2.3-70-g09d2