summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2013-12-03 11:29:07 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2013-12-03 11:29:07 +0000
commit65a79d59bd9a40d2356378a09ce4828808a3c917 (patch)
treeb4c844f7e9b13073aadef003ae4cb0d83404b1ff
parent41a13cbaa323e38f9755df1a8c8760f5a878bd4a (diff)
parent5d41ed2a92e37b720ee3bb4c8ee42a5317fed087 (diff)
downloadopenssl-new-65a79d59bd9a40d2356378a09ce4828808a3c917.tar.gz
Merge branch 'baserock/pedroalvarez/power-port' into baserock/morph
Reviewed-by: Dan Firth Reviewed-by: Lars Wirzenius
-rw-r--r--openssl-new.morph7
1 files changed, 6 insertions, 1 deletions
diff --git a/openssl-new.morph b/openssl-new.morph
index 2911d20fdb..d92bba165d 100644
--- a/openssl-new.morph
+++ b/openssl-new.morph
@@ -3,7 +3,12 @@ kind: chunk
max-jobs: 1
configure-commands:
- sed -i -e 's,^LIBNAMES=\\(.*\\) padlock \\(.*\\),LIBNAMES=\\1 \\2,g' engines/Makefile
-- ./config --openssldir=/etc/ssl --prefix="${PREFIX-/usr}" --libdir=lib shared
+- >
+ if [ "$(uname -m)" = "ppc64" ]; then
+ sh ./Configure linux-ppc64 --openssldir=/etc/ssl --prefix="${PREFIX-/usr}" --libdir=lib shared
+ else
+ ./config --openssldir=/etc/ssl --prefix="${PREFIX-/usr}" --libdir=lib shared
+ fi
build-commands:
- make
install-commands: