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

Stephan Bergmann sbergman at redhat.com
Thu Sep 12 01:15:55 PDT 2013


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

New commits:
commit 18251a64d58e0a925c66c67ce9d0b1b83a442a19
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 12 10:14:35 2013 +0200

    Looks like build_engines (incl. in build_libs) is needed afer all
    
    ...otherwise, building postgresql fails with missing "_ENGINE_load_4758cca"
    referenced from _ENGINE_load_builtin_engines in libcrypto.a(eng_all.o) etc.
    
    Change-Id: Ie3414164ee4f11a94cd59ec5ea072a40e99706fb

diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk
index 8df16bc..b825622 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -84,7 +84,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
 			$(if $(filter-out ANDROID IOS WNT,$(OS)), \
 				$(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
-		&& $(MAKE) build_crypto build_ssl \
+		&& $(MAKE) build_libs \
 			CC="$(CC) $(if $(filter-out WNT,$(OS)),\
 			$(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\
 			-fvisibility=hidden))" \


More information about the Libreoffice-commits mailing list