From 93e7267dcce46515e61287bfe932e2e5854ef454 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Wed, 21 Oct 2020 15:31:29 -0700 Subject: unzip: fix build for XCode 12 on macosx (#19453) - [x] `build_targets` should use `macosx` on macOS, `generic` on other systems - [x] enable `LARGE_FILE_SUPPORT` by default --- var/spack/repos/builtin/packages/unzip/package.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/unzip/package.py b/var/spack/repos/builtin/packages/unzip/package.py index 224c495a64..986bf60705 100644 --- a/var/spack/repos/builtin/packages/unzip/package.py +++ b/var/spack/repos/builtin/packages/unzip/package.py @@ -19,8 +19,15 @@ class Unzip(MakefilePackage): def patch(self): filter_file(r'^LFLAGS2=.*', 'LFLAGS2=', join_path('unix', 'configure')) - make_args = ['-f', join_path('unix', 'Makefile')] - build_targets = make_args + ['generic'] + make_args = [ + '-f', join_path('unix', 'Makefile'), + "LOC=-DLARGE_FILE_SUPPORT" + ] + + @property + def build_targets(self): + target = "macosx" if "platform=darwin" in self.spec else "generic" + return self.make_args + [target] def url_for_version(self, version): return 'http://downloads.sourceforge.net/infozip/unzip{0}.tar.gz'.format(version.joined) -- cgit v1.2.3-60-g2f50