[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - external/nss

[Miklos Vajna (via logerrit)]

 external/nss/ExternalProject_nss.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit c252189e3a17e128de99b7721c12e2ecf28271fe
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Jan 3 21:31:14 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Oct 22 14:08:32 2019 +0200

    nss: disable gtests
    
    We don't run them and building them takes a while, especially with -j1.
    
    Old time: 2m35,809s
    
    New time: 1m12,858s
    
    (With ccache disabled.) I.e. 47% of baseline.
    
    Change-Id: I3e2d75b27be3c5995b5e6db9812c9f82d33f42fd
    Reviewed-on: https://gerrit.libreoffice.org/65843
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/81221
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index a270e1f7de87..ef807d503e58 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -52,6 +52,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta
 			CC="$(CC)$(if $(filter ANDROID,$(OS)), -D_PR_NO_LARGE_FILES=1 -DSQLITE_DISABLE_LFS=1)" CCC="$(CXX)" \
 			$(if $(CROSS_COMPILING),NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \
 			$(if $(filter ANDROID,$(OS)),OS_TARGET=Android OS_TARGET_RELEASE=14 ARCHFLAG="" DEFAULT_COMPILER=clang ANDROID_NDK=$(ANDROID_NDK_HOME) ANDROID_TOOLCHAIN_VERSION=$(ANDROID_GCC_TOOLCHAIN_VERSION) ANDROID_PREFIX=$(HOST_PLATFORM) ANDROID_SYSROOT=$(SYSBASE) ANDROID_TOOLCHAIN=$(ANDROID_BINUTILS_PREBUILT_ROOT)) \
+			NSS_DISABLE_GTESTS=1 \
 			nss_build_all \
 		&& rm -f $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
 		$(if $(filter MACOSX,$(OS)),\