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

[Miklos Vajna]

 openssl/ExternalProject_openssl.mk |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 13bd8bbc7fb32d87ac558db049de225a617ab7a7
Author: Miklos Vajna <vmik...@suse.cz>
Date:   Thu Feb 28 09:00:16 2013 +0100

    openssl: unset MAKEFLAGS on !MSC as well
    
    This fixes the following build error here:
    
    ar: creating ../libcrypto.a
    ar: cryptlib.o: No such file or directory
    make[2]: *** [../libcrypto.a] Error 1
    
    Change-Id: I8f746f4ff44c3797583678e47956363c0cd49829

diff --git a/openssl/ExternalProject_openssl.mk 
b/openssl/ExternalProject_openssl.mk
index 954fc2b..891dd71 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -48,8 +48,8 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
 else
 $(call gb_ExternalProject_get_state_target,openssl,build):
        $(call gb_ExternalProject_run,build,\
-               MAKE="$(MAKE) -j1" \
-               $(if $(filter LINUX FREEBSD ANDROID SOLARIS 
IOS,$(OS)),./Configure,\
+               unset MAKEFLAGS \
+               && $(if $(filter LINUX FREEBSD ANDROID SOLARIS 
IOS,$(OS)),./Configure,\
                $(if $(filter WNT,$(OS)),$(PERL) Configure,./config)) \
                        $(OPENSSL_PLATFORM) \
                        $(if $(filter ANDROID,$(OS)),\
@@ -59,8 +59,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
                        shared no-idea \
                        $(if $(SYSBASE),-I$(SYSBASE)/usr/include 
-L$(SYSBASE)/usr/lib)))) \
                        $(if $(filter 
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
 \
-               && export MAKEFLAGS="$(MAKEFLAGS:r=)" \
-               && $(MAKE) -j1 build_libs \
+               && $(MAKE) build_libs \
                        CC="$(CC) $(if $(filter-out WNT,$(OS)),\
                        $(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\
                        -fvisibility=hidden))" \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits