diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2023-09-13 08:59:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-13 08:59:47 +0200 |
| commit | e8740b40dad3590f330f2f6e522e9b982ba4f410 (patch) | |
| tree | c4675d17641340efef7a0ba074b792cf99ac8c42 | |
| parent | e45fc994aafdfe5da18d43f6bbb76564e8201f59 (diff) | |
| download | spack-e8740b40dad3590f330f2f6e522e9b982ba4f410.tar.gz spack-e8740b40dad3590f330f2f6e522e9b982ba4f410.tar.bz2 spack-e8740b40dad3590f330f2f6e522e9b982ba4f410.tar.xz spack-e8740b40dad3590f330f2f6e522e9b982ba4f410.zip | |
unifyfs: support openssl 3 (#39945)
* unifyfs: drop upperbound on deprecated openssl
The package uses deprecated MD5 functions from OpenSSL, which causes
warnings, but (a) Spack by default disables -Werror, and (b) those
functions will continue to exist in OpenSSL 3.
* unifyfs: enable parallel build, only make check sequential
* unifyfs: order class methods by install phases
| -rw-r--r-- | var/spack/repos/builtin/packages/unifyfs/package.py | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/var/spack/repos/builtin/packages/unifyfs/package.py b/var/spack/repos/builtin/packages/unifyfs/package.py index 88896b338b..9cc1b3db64 100644 --- a/var/spack/repos/builtin/packages/unifyfs/package.py +++ b/var/spack/repos/builtin/packages/unifyfs/package.py @@ -73,7 +73,10 @@ class Unifyfs(AutotoolsPackage): # after v0.13.1. depends_on("mochi-margo@0.10:", when="@1.1:") depends_on("mpi") - depends_on("openssl@:1") + + # unifyfs@:1.1 uses MD5 functions that are deprecated in OpenSSL 3, and + # likely to be removed in the next major release. + depends_on("openssl@:3") # Mochi-Margo dependencies depends_on("mercury@1.0.1+bmi", when="@:0.9.1") @@ -94,9 +97,6 @@ class Unifyfs(AutotoolsPackage): patch("unifyfs-sysio.c.patch", when="@0.9.1") patch("include-sys-sysmacros.h.patch", when="@0.9.1:0.9.2") - # Parallel disabled to prevent tests from being run out-of-order when - # installed with the --test={root, all} option. - parallel = False debug_build = False build_directory = "spack-build" @@ -124,6 +124,15 @@ class Unifyfs(AutotoolsPackage): if self.spec.satisfies("%oneapi"): env.append_flags("CFLAGS", "-Wno-unused-function") + @when("%cce@11.0.3:") + def patch(self): + filter_file("-Werror", "", "client/src/Makefile.in") + filter_file("-Werror", "", "client/src/Makefile.am") + + @when("@develop") + def autoreconf(self, spec, prefix): + Executable("./autogen.sh")() + def configure_args(self): spec = self.spec args = ["--with-gotcha=%s" % spec["gotcha"].prefix] @@ -142,12 +151,6 @@ class Unifyfs(AutotoolsPackage): return args - @when("@develop") - def autoreconf(self, spec, prefix): - sh = which("sh") - sh("./autogen.sh") - - @when("%cce@11.0.3:") - def patch(self): - filter_file("-Werror", "", "client/src/Makefile.in") - filter_file("-Werror", "", "client/src/Makefile.am") + def check(self): + with working_dir(self.build_directory): + make("check", parallel=False) |