zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: copy mozilla certs to work around symlink relocation issue (#31862)

Browse Source
This commit is contained in:
Harmen Stoppels 2022-08-03 14:16:47 +02:00 committed by GitHub
parent ba9b225ffc
commit 78364a6fe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/openssl/package.py
View File

@ -318,7 +318,7 @@ class Openssl(Package): # Uses Fake Autotools, should subclass Package
depends_on("zlib") depends_on("zlib")
depends_on("perl@5.14.0:", type=("build", "test")) 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") depends_on("nasm", when="platform=windows")
patch( patch(
@ -473,7 +473,7 @@ def link_system_certs(self):
os.symlink(sys_certs, pkg_certs) os.symlink(sys_certs, pkg_certs)
@run_after("install") @run_after("install")
def link_mozilla_certs(self): def copy_mozilla_certs(self):
if self.spec.variants["certs"].value != "mozilla": if self.spec.variants["certs"].value != "mozilla":
return return
@ -482,9 +482,7 @@ def link_mozilla_certs(self):
mozilla_pem = self.spec["ca-certificates-mozilla"].pem_path mozilla_pem = self.spec["ca-certificates-mozilla"].pem_path
pkg_cert = join_path(pkg_dir, "cert.pem") pkg_cert = join_path(pkg_dir, "cert.pem")
install(mozilla_pem, pkg_cert)
if not os.path.exists(pkg_cert):
os.symlink(mozilla_pem, pkg_cert)
def patch(self): def patch(self):
if self.spec.satisfies("%nvhpc"): if self.spec.satisfies("%nvhpc"):