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

[Stephan Bergmann]

 openssl/ExternalProject_openssl.mk |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 9f8736411d454bfd711ef964288c50aae9f9e375
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 12 09:34:48 2013 +0200

    Only build in ExternalProject_openssl what's needed in ExternalPackage_openssl
    
    ...i.e., for non-MSC always use "non-shared" (this also prevents a build error
    when using -fvisibility-hidden on Mac OS X and linking fips_premain_dso misses
    symbols) and just build "lib_crypto lib_ssl".  Also cleaned up the rest of the
    configure command line while trying not to change any of its meaning (and I have
    no idea about WNT-GCC lacking "no-idea", likely just lots of cargo cult there
    awaiting further clean-up).
    
    Change-Id: I34ec43975cda7af800eeba5d4f6a0beaeca6f6bc

diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk
index e50dee9..8df16bc 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -73,19 +73,18 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
 else
 $(call gb_ExternalProject_get_state_target,openssl,build):
 	$(call gb_ExternalProject_run,build,\
-		unset MAKEFLAGS \
-		&& $(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,\
-			$(if $(filter WNT,$(OS)),shared,\
-			shared no-idea \
-			$(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)))) \
+		unset MAKEFLAGS && \
+		$(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS IOS,$(OS)), \
+			./Configure, \
+		$(if $(filter WNT,$(OS)), \
+			$(PERL) Configure, \
+			./config)) \
+			$(OPENSSL_PLATFORM) no-dso no-shared \
+			$(if $(filter-out WNT,$(OS)),no-idea) \
+			$(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_libs \
+		&& $(MAKE) build_crypto build_ssl \
 			CC="$(CC) $(if $(filter-out WNT,$(OS)),\
 			$(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\
 			-fvisibility=hidden))" \