From a540a68561db4067b66b4d4d0920b217fea4fda4 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Tue, 22 Dec 2015 18:51:49 -0500 Subject: Make OpenSSL build on Darwin --- var/spack/packages/openssl/package.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/packages/openssl/package.py b/var/spack/packages/openssl/package.py index 40648fca49..82c315da33 100644 --- a/var/spack/packages/openssl/package.py +++ b/var/spack/packages/openssl/package.py @@ -17,12 +17,24 @@ class Openssl(Package): parallel = False def install(self, spec, prefix): - config = Executable("./config") - config("--prefix=%s" % prefix, - "--openssldir=%s/etc/openssl" % prefix, - "zlib", - "no-krb5", - "shared") + if spec.satisfies("=darwin-x86_64"): + perl = which('perl') + perl("./Configure", + "--prefix=%s" % prefix, + "--openssldir=%s/etc/openssl" % prefix, + "zlib", + "no-krb5", + "shared", + "darwin64-x86_64-cc") + perl('-pi', '-e', 's/-arch x86_64//g', 'Makefile') + else: + exit(1) + config = Executable("./config") + config("--prefix=%s" % prefix, + "--openssldir=%s/etc/openssl" % prefix, + "zlib", + "no-krb5", + "shared") make() make("install") -- cgit v1.2.3-70-g09d2 From a58dd8f6abb00281af1b469981dce760cd1c55ff Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Wed, 23 Dec 2015 18:19:26 -0500 Subject: Remove leftover debug statement --- var/spack/packages/openssl/package.py | 1 - 1 file changed, 1 deletion(-) (limited to 'var') diff --git a/var/spack/packages/openssl/package.py b/var/spack/packages/openssl/package.py index 82c315da33..a51bace666 100644 --- a/var/spack/packages/openssl/package.py +++ b/var/spack/packages/openssl/package.py @@ -28,7 +28,6 @@ class Openssl(Package): "darwin64-x86_64-cc") perl('-pi', '-e', 's/-arch x86_64//g', 'Makefile') else: - exit(1) config = Executable("./config") config("--prefix=%s" % prefix, "--openssldir=%s/etc/openssl" % prefix, -- cgit v1.2.3-70-g09d2 From be12720eb797e5a3a6031067248035db7d291962 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Fri, 25 Dec 2015 14:02:56 -0500 Subject: Use `filter_file` instead of calling perl --- var/spack/packages/openssl/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/packages/openssl/package.py b/var/spack/packages/openssl/package.py index a51bace666..e1039fcbe1 100644 --- a/var/spack/packages/openssl/package.py +++ b/var/spack/packages/openssl/package.py @@ -26,7 +26,7 @@ class Openssl(Package): "no-krb5", "shared", "darwin64-x86_64-cc") - perl('-pi', '-e', 's/-arch x86_64//g', 'Makefile') + filter_file(r'-arch x86_64', '', 'Makefile') else: config = Executable("./config") config("--prefix=%s" % prefix, -- cgit v1.2.3-70-g09d2 From 12632f16b8a5f51fd35ad81c9a8625fe1e30cd7c Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Tue, 5 Jan 2016 13:17:17 -0500 Subject: Combine with other OpenSSL Darwin patch Set KERNEL_BITS. Don't use Darwin-specific configure script. --- var/spack/packages/openssl/package.py | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'var') diff --git a/var/spack/packages/openssl/package.py b/var/spack/packages/openssl/package.py index e1039fcbe1..779c31af12 100644 --- a/var/spack/packages/openssl/package.py +++ b/var/spack/packages/openssl/package.py @@ -17,23 +17,18 @@ class Openssl(Package): parallel = False def install(self, spec, prefix): - if spec.satisfies("=darwin-x86_64"): - perl = which('perl') - perl("./Configure", - "--prefix=%s" % prefix, - "--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("--prefix=%s" % prefix, - "--openssldir=%s/etc/openssl" % prefix, - "zlib", - "no-krb5", - "shared") + if spec.satisfies("=darwin-x86_64") or spec.satisfies("=ppc64"): + # This needs to be done for all 64-bit architectures (except Linux, + # where it happens automatically?) + env['KERNEL_BITS'] = '64' + config = Executable("./config") + config("--prefix=%s" % prefix, + "--openssldir=%s" % join_path(prefix, 'etc', 'openssl'), + "zlib", + "no-krb5", + "shared") + # Remove non-standard compiler options if present + filter_file(r'-arch x86_64', '', 'Makefile') make() make("install") -- cgit v1.2.3-70-g09d2 From c18dfa058a208627063d069566a728d8715f984c Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Tue, 5 Jan 2016 14:09:54 -0500 Subject: Add details to comment --- var/spack/packages/openssl/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/packages/openssl/package.py b/var/spack/packages/openssl/package.py index 779c31af12..a24de20cc3 100644 --- a/var/spack/packages/openssl/package.py +++ b/var/spack/packages/openssl/package.py @@ -27,7 +27,9 @@ class Openssl(Package): "zlib", "no-krb5", "shared") - # Remove non-standard compiler options if present + # Remove non-standard compiler options if present. These options are + # present e.g. on Darwin. They are non-standard, i.e. most compilers + # (e.g. gcc) will not accept them. filter_file(r'-arch x86_64', '', 'Makefile') make() -- cgit v1.2.3-70-g09d2