openssl/ExternalProject_openssl.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4b2c4191cdb489055197355d93690caa9a220ef5
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Sep 3 19:35:07 2013 +0300
For some reason the asm code for rc4_md5_enc seems to go missing for x64
Linux
So configure OpenSSL with the no-asm switch in that case.
Change-Id: I3ac291a5ca7681c14c269682deaf82798d76f522
diff --git a/openssl/ExternalProject_openssl.mk
b/openssl/ExternalProject_openssl.mk
index ed99fe5..35db867 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -26,7 +26,7 @@ OPENSSL_PLATFORM := \
$(if $(filter GNU/kFreeBSD,$(shell uname)),\
debian-kfreebsd-amd64\
,\
- $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64,
linux-generic64)\
+ $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64,
linux-generic64) no-asm\
)\
,\
$(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic32,
linux-generic32)\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
