[PATCH] Fix https://-related crashes.

[Markus Mohrhard (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3488

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/3488/1

Fix https://-related crashes.

The internal openssl on 64bit linux was built as linux-generic32, instead of
linux-generi64, which caused crashes later when used.  This patch alignes it
with the logic before gbuildization.

Change-Id: I2919a91138e8f33ad50e64728496144bac815321
---
M openssl/ExternalProject_openssl.mk
1 file changed, 4 insertions(+), 3 deletions(-)



diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk
index aa5492f..97cd10f 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -17,9 +17,10 @@
 
 OPENSSL_PLATFORM := $(if $(filter LINUX FREEBSD ANDROID,$(OS)),\
 	$(if $(filter I,$(CPU)),\
-	$(if $(filter GNU/kFreeBSD,$(shell uname)),\
-	debian-kfreebsd-i386,linux-elf),\
-	linux-generic32),\
+	  $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf),\
+	  $(if $(filter X,$(CPU)),\
+	    $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-amd64,linux-generic64),\
+	    linux-generic32)),\
 	$(if $(filter SOLARIS,$(OS)),\
 	$(if $(filter INTEL,$(CPUNAME)),\
 	$(if $(filter X,$(CPU)),\

-- 
To view, visit https://gerrit.libreoffice.org/3488
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2919a91138e8f33ad50e64728496144bac815321
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Markus Mohrhard <markus.mohrhard at googlemail.com>
Gerrit-Reviewer: Jan Holesovsky <kendy at suse.cz>