[Libreoffice-commits] core.git: openssl/ExternalProject_openssl.mk

Markus Mohrhard markus.mohrhard at googlemail.com
Sat Apr 20 08:05:58 PDT 2013


 openssl/ExternalProject_openssl.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6912b8e0c51bcac956c2c05b2fafdf84df7ae8ee
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Apr 19 22:35:31 2013 +0200

    enable symbols and disable optimization in openssl for a dbgutil build
    
    Change-Id: I2100d40264c067b22548025ab3a3be32a23835a6
    Reviewed-on: https://gerrit.libreoffice.org/3489
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk
index 97cd10f..2666965 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -19,8 +19,9 @@ OPENSSL_PLATFORM := $(if $(filter LINUX FREEBSD ANDROID,$(OS)),\
 	$(if $(filter I,$(CPU)),\
 	  $(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 GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-amd64,\
+		$(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, linux-generic64)),\
+	    $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic32, linux-generic32))),\
 	$(if $(filter SOLARIS,$(OS)),\
 	$(if $(filter INTEL,$(CPUNAME)),\
 	$(if $(filter X,$(CPU)),\


More information about the Libreoffice-commits mailing list