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

Combine with other OpenSSL Darwin patch

Browse Source 
Set KERNEL_BITS.
Don't use Darwin-specific configure script.
This commit is contained in:
Erik Schnetter 2016-01-05 13:17:17 -05:00
parent 25934200de
commit 12632f16b8
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
var/spack/packages/openssl/package.py
View File

@ -17,23 +17,18 @@ class Openssl(Package):
parallel = False parallel = False
def install(self, spec, prefix): def install(self, spec, prefix):
if spec.satisfies("=darwin-x86_64"): if spec.satisfies("=darwin-x86_64") or spec.satisfies("=ppc64"):
perl = which('perl') # This needs to be done for all 64-bit architectures (except Linux,
perl("./Configure", # where it happens automatically?)
"--prefix=%s" % prefix, env['KERNEL_BITS'] = '64'
"--openssldir=%s/etc/openssl" % prefix,
"zlib",
"no-krb5",
"shared",
"darwin64-x86_64-cc")
filter_file(r'-arch x86_64', '', 'Makefile')
else:
config = Executable("./config") config = Executable("./config")
config("--prefix=%s" % prefix, config("--prefix=%s" % prefix,
"--openssldir=%s/etc/openssl" % prefix, "--openssldir=%s" % join_path(prefix, 'etc', 'openssl'),
"zlib", "zlib",
"no-krb5", "no-krb5",
"shared") "shared")
# Remove non-standard compiler options if present
filter_file(r'-arch x86_64', '', 'Makefile')
make() make()
make("install") make("install")