From ed26c01be15ebc9031ee5ef709d88d524f0fc16d Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Thu, 21 Feb 2013 08:15:39 -0600
Subject: quiet external module build log unless failure

ExternalProject usually involve a configure and a make
step that produce a bunch of output usually irrelevant
including a large number of warning and other mess.
now that everything is pretty much in tail_build
these output get interleaved with useful output from
the build of the product and actually drown them in a logorrhea
of messy noise.
This store the output of external modules in a log file
and only print them as a whole if the module failed do build.
on a non-verbose build.

Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
Reviewed-on: https://gerrit.libreoffice.org/2304
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
---
 postgresql/ExternalProject_postgresql.mk | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'postgresql')

diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk
index 6b54253bfd00..5fef28ecaaf6 100644
--- a/postgresql/ExternalProject_postgresql.mk
+++ b/postgresql/ExternalProject_postgresql.mk
@@ -22,30 +22,30 @@ $(eval $(call gb_ExternalProject_register_targets,postgresql,\
 ifeq ($(OS)$(COM),WNTMSC)
 
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
-	cd $(EXTERNAL_WORKDIR)/src \
-	&& MAKEFLAGS= && nmake -f win32.mak USE_SSL=1 USE_LDAP=1 \
-	&& touch $@
+	$(call gb_ExternalProject_run,build,\
+		MAKEFLAGS= && nmake -f win32.mak USE_SSL=1 USE_LDAP=1 \
+	,src)
 
 else
 
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
-	cd $(EXTERNAL_WORKDIR) \
-	&& ./configure \
-		--without-readline --disable-shared --with-openssl --with-ldap \
-		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-		$(if $(filter YES,$(WITH_KRB5)),--with-krb5) \
-		$(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi) \
-		CPPFLAGS="$(if $(filter NO,$(SYSTEM_OPENLDAP)),\
-		-I$(call gb_UnpackedTarball_get_dir,openldap/include)) \
-		$(if $(filter NO,$(SYSTEM_OPENSSL)),\
-		-I$(call gb_UnpackedTarball_get_dir,openssl/include))" \
-		$(if $(filter NO,$(SYSTEM_OPENLDAP)), \
+	$(call gb_ExternalProject_run,build,\
+		./configure \
+			--without-readline --disable-shared --with-openssl --with-ldap \
+			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(filter YES,$(WITH_KRB5)),--with-krb5) \
+			$(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi) \
+			CPPFLAGS="$(if $(filter NO,$(SYSTEM_OPENLDAP)),\
+			-I$(call gb_UnpackedTarball_get_dir,openldap/include)) \
+			$(if $(filter NO,$(SYSTEM_OPENSSL)),\
+			-I$(call gb_UnpackedTarball_get_dir,openssl/include))" \
+			$(if $(filter NO,$(SYSTEM_OPENLDAP)), \
 			LDFLAGS="-L$(OUTDIR)/lib" \
 			EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \
-		) \
-	&& cd src/interfaces/libpq \
-	&& MAKEFLAGS= && $(MAKE) all-static-lib libpq-flags.mk \
-	&& touch $@
+			) \
+		&& cd src/interfaces/libpq \
+		&& MAKEFLAGS= && $(MAKE) all-static-lib libpq-flags.mk \
+	)
 
 endif
 
-- 
cgit v1.2.3