[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - external/openssl

[Caolán McNamara (via logerrit)]

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

New commits:
commit 1fd1538e3957a5300dc282b7b97597c75d71e64e
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Oct 12 15:13:37 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Oct 12 21:11:54 2023 +0200

    try to avoid linking openssl with -latomic on android
    
    so curl doesn't failed to build with:
    
    
openssl/lib/libcrypto.a(libcrypto-lib-threads_pthread.o):threads_pthread.c:function
    CRYPTO_atomic_or: error: undefined reference to '__atomic_is_lock_free'
    
    Change-Id: I5352b51b6e2d3d8f88e472fd893587b76152c270
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157869
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/external/openssl/ExternalProject_openssl.mk 
b/external/openssl/ExternalProject_openssl.mk
index 81a7c5ff6c67..9a0fae891a0f 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -89,7 +89,8 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
                && $(MAKE) build_libs \
                        CC="$(CC) -fPIC \
                                $(if $(filter TRUE, $(ENABLE_DBGUTIL)), 
-DPURIFY,) \
-                               $(if $(filter-out WNT 
MACOSX,$(OS)),-fvisibility=hidden)" \
+                               $(if $(filter-out WNT 
MACOSX,$(OS)),-fvisibility=hidden) \
+                               $(if $(filter 
ANDROID,$(OS)),-DBROKEN_CLANG_ATOMICS)" \
                && ln -s . lib \
        )
        $(call gb_Trace_EndRange,openssl,EXTERNAL)