openssl/ExternalProject_openssl.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 54885512f2dc18d0095c6002d27bb2f7195b797a
Author: Tor Lillqvist <[email protected]>
Date:   Tue Sep 3 21:48:33 2013 +0300

    Pass no-dso to the OpenSSL configury
    
    No idea why OpenSSL would need to load dynamic libraries. Avoid linking 
error
    on Linux when linking OpenSSL-using stuff (at least libpostgresql-sdbc-impl)
    as we don't use -ldl when linking it. Sure, we could instead add -ldl to the
    libraries used by libpostgresql-sdbc-impl I guess, but let's see first if 
this
    works.
    
    Change-Id: Ia4e5c6b8b08c127f378e1578de93c1fd5b213016

diff --git a/openssl/ExternalProject_openssl.mk 
b/openssl/ExternalProject_openssl.mk
index 35db867..e50dee9 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -77,6 +77,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
                && $(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS 
IOS,$(OS)),./Configure,\
                $(if $(filter WNT,$(OS)),$(PERL) Configure,./config)) \
                        $(OPENSSL_PLATFORM) \
+                       no-dso \
                        $(if $(filter ANDROID,$(OS)),\
                        shared no-idea,\
                        $(if $(filter IOS,$(OS)),no-shared no-idea,\
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to