[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/openssl

[Norbert Thiebaud]

 external/openssl/UnpackedTarball_openssl.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 75ea06ea2366cdde73861be0b14ff2fc959ea03a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Apr 11 13:53:17 2015 -0500

    openssl build breakage on MacOSX 10.6
    
    3217bae01e58e7fe6f075514cf8d2baf89e76afe changed the apply
    of openssllnx.patch to make it unconditinal
    which introduce a -Wa, option that is not supported
    by the 10.6SDK
    
    Change-Id: Ic9f68bad5c7d0694d206bc4d6899ab01009942c0
    Reviewed-on: https://gerrit.libreoffice.org/15252
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk
index 0dbd470..b769082 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -91,7 +91,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
-	external/openssl/openssllnx.patch \
+	$(if $(filter MACOSX1060,$(OS)$(MACOSX_SDK_VERSION)),,external/openssl/openssllnx.patch) \
 	external/openssl/opensslmingw.patch \
 	external/openssl/opensslwnt.patch \
 	external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 \