diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/unzip/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/unzip/package.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/unzip/package.py b/var/spack/repos/builtin/packages/unzip/package.py index 39deb4e6c0..f04dee4f8c 100644 --- a/var/spack/repos/builtin/packages/unzip/package.py +++ b/var/spack/repos/builtin/packages/unzip/package.py @@ -10,29 +10,30 @@ class Unzip(MakefilePackage): """Unzip is a compression and file packaging/archive utility.""" homepage = "http://www.info-zip.org/Zip.html" - url = "http://downloads.sourceforge.net/infozip/unzip60.tar.gz" + url = "https://downloads.sourceforge.net/infozip/unzip60.tar.gz" license("custom") version("6.0", sha256="036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37") - patch("configure-cflags.patch", when="%clang@16:") + depends_on("c", type="build") # generated + depends_on("cxx", type="build") # generated - # The Cray cc wrapper doesn't handle the '-s' flag (strip) cleanly. - @when("platform=cray") - def patch(self): - filter_file(r"^LFLAGS2=.*", "LFLAGS2=", join_path("unix", "configure")) + # 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") + patch("strip.patch") def get_make_args(self): make_args = ["-f", join_path("unix", "Makefile")] cflags = [] - if self.spec.satisfies("%clang@16:"): + if not self.spec.satisfies("%nvhpc"): 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))) + make_args.append(f"LOC={' '.join(cflags)}") return make_args @property @@ -41,8 +42,8 @@ class Unzip(MakefilePackage): return self.get_make_args() + [target] def url_for_version(self, version): - return "http://downloads.sourceforge.net/infozip/unzip{0}.tar.gz".format(version.joined) + return f"http://downloads.sourceforge.net/infozip/unzip{version.joined}.tar.gz" @property def install_targets(self): - return self.get_make_args() + ["prefix={0}".format(self.prefix), "install"] + return self.get_make_args() + [f"prefix={self.prefix}", "install"] |