summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarmen Stoppels <harmenstoppels@gmail.com>2022-08-03 14:16:47 +0200
committerGitHub <noreply@github.com>2022-08-03 14:16:47 +0200
commit78364a6fe48305c026cdd304cdc28c603d58b54c (patch)
tree8bc29f3b46c51d5c38bf516443157b199e9d709b
parentba9b225ffcf04ecaa60a4a5df5462308bc31579b (diff)
downloadspack-78364a6fe48305c026cdd304cdc28c603d58b54c.tar.gz
spack-78364a6fe48305c026cdd304cdc28c603d58b54c.tar.bz2
spack-78364a6fe48305c026cdd304cdc28c603d58b54c.tar.xz
spack-78364a6fe48305c026cdd304cdc28c603d58b54c.zip
openssl: copy mozilla certs to work around symlink relocation issue (#31862)
-rw-r--r--var/spack/repos/builtin/packages/openssl/package.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py
index 6902bf84d5..2d420e7574 100644
--- a/var/spack/repos/builtin/packages/openssl/package.py
+++ b/var/spack/repos/builtin/packages/openssl/package.py
@@ -318,7 +318,7 @@ class Openssl(Package): # Uses Fake Autotools, should subclass Package
depends_on("zlib")
depends_on("perl@5.14.0:", type=("build", "test"))
- depends_on("ca-certificates-mozilla", type=("build", "run"), when="certs=mozilla")
+ depends_on("ca-certificates-mozilla", type="build", when="certs=mozilla")
depends_on("nasm", when="platform=windows")
patch(
@@ -473,7 +473,7 @@ class Openssl(Package): # Uses Fake Autotools, should subclass Package
os.symlink(sys_certs, pkg_certs)
@run_after("install")
- def link_mozilla_certs(self):
+ def copy_mozilla_certs(self):
if self.spec.variants["certs"].value != "mozilla":
return
@@ -482,9 +482,7 @@ class Openssl(Package): # Uses Fake Autotools, should subclass Package
mozilla_pem = self.spec["ca-certificates-mozilla"].pem_path
pkg_cert = join_path(pkg_dir, "cert.pem")
-
- if not os.path.exists(pkg_cert):
- os.symlink(mozilla_pem, pkg_cert)
+ install(mozilla_pem, pkg_cert)
def patch(self):
if self.spec.satisfies("%nvhpc"):