From 6dd19594ab1cbcd20ee0de73529ca94fc25b7396 Mon Sep 17 00:00:00 2001 From: Chris Marsh Date: Fri, 9 Feb 2024 14:04:05 -0600 Subject: [PATCH] Resolve unzip build failure with %oneapi (#42593) * apply patch to all compilers as per spack/issues/42007 * [@spackbot] updating style on behalf of Chrismarsh * Resolve flake8 style issue from spackbot * fix flake8 trailing whitespace --------- Co-authored-by: Chrismarsh --- var/spack/repos/builtin/packages/unzip/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/unzip/package.py b/var/spack/repos/builtin/packages/unzip/package.py index 39deb4e6c08..553a3da2988 100644 --- a/var/spack/repos/builtin/packages/unzip/package.py +++ b/var/spack/repos/builtin/packages/unzip/package.py @@ -16,7 +16,9 @@ class Unzip(MakefilePackage): version("6.0", sha256="036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37") - patch("configure-cflags.patch", when="%clang@16:") + # clang and oneapi need this patch, likely others + # There is no problem with it on gcc, so make it a catch all + patch("configure-cflags.patch") # The Cray cc wrapper doesn't handle the '-s' flag (strip) cleanly. @when("platform=cray") @@ -27,9 +29,8 @@ def get_make_args(self): make_args = ["-f", join_path("unix", "Makefile")] cflags = [] - if self.spec.satisfies("%clang@16:"): - cflags.append("-Wno-error=implicit-function-declaration") - cflags.append("-Wno-error=implicit-int") + cflags.append("-Wno-error=implicit-function-declaration") + cflags.append("-Wno-error=implicit-int") cflags.append("-DLARGE_FILE_SUPPORT") make_args.append('LOC="{}"'.format(" ".join(cflags)))