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>

3 files changed, 95 insertions, 96 deletions

diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk
index 7a778ff797c7..fdd7c098fbf3 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -19,43 +19,42 @@ $(eval $(call gb_ExternalProject_register_targets,raptor,\
 
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,raptor,build):
-	cd $(EXTERNAL_WORKDIR) \
-	&& CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
-	LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \
-	LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
-	XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
-	OBJDUMP="$(HOST_PLATFORM)-objdump" \
-	./configure --disable-static --enable-shared --disable-gtk-doc --with-openssl-digests \
-	--with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
-	--without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore \
-	--with-regex-library=posix --with-decimal=none --with-www=xml \
-	--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \
-	lt_cv_cc_dll_switch="-shared" \
-	&& $(MAKE) \
-	&& touch $@
+	$(call gb_ExternalProject_run,build,\
+		CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+		LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \
+		LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
+		XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
+		OBJDUMP="$(HOST_PLATFORM)-objdump" \
+		./configure --disable-static --enable-shared --disable-gtk-doc --with-openssl-digests \
+			--with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
+			--without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore \
+			--with-regex-library=posix --with-decimal=none --with-www=xml \
+			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \
+			lt_cv_cc_dll_switch="-shared" \
+		&& $(MAKE) \
+	)
 else
 $(call gb_ExternalProject_get_state_target,raptor,build):
-	cd $(EXTERNAL_WORKDIR) \
-	&& $(if $(filter IOS,$(OS)),LIBS="-liconv") \
-	CFLAGS="$(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \
-	$(if $(filter GCCLINUXPOWERPC64,$(COM)$(OS)$(CPUNAME)),-mminimal-toc)" \
-	LDFLAGS="-L$(OUTDIR)/lib \
+	$(call gb_ExternalProject_run,build,\
+		$(if $(filter IOS,$(OS)),LIBS="-liconv") \
+		CFLAGS="$(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \
+		$(if $(filter GCCLINUXPOWERPC64,$(COM)$(OS)$(CPUNAME)),-mminimal-toc)" \
+		LDFLAGS="-L$(OUTDIR)/lib \
 		$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \
 		$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
-	CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
-	./configure --disable-gtk-doc --with-threads --with-openssl-digests \
-	--with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
-	--without-bdb --without-sqlite --without-mysql --without-postgresql \
-	--without-threestone --with-regex-library=posix --with-decimal=none \
-	--with-www=xml \
-	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-        $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
-	$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
-	$(if $(filter NO,$(SYSTEM_LIBXSLT)),--with-xslt-config=$(OUTDIR)/bin/xslt-config) \
-	$(if $(filter NO,$(SYSTEM_LIBXML)), \
-		LIBXML2LIB=-lxml2 \
-		--with-xml2-config=$(OUTDIR)/bin/xml2-config) \
-	&& $(MAKE) \
-	&& touch $@
+		CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
+		./configure --disable-gtk-doc --with-threads --with-openssl-digests \
+			--with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
+			--without-bdb --without-sqlite --without-mysql --without-postgresql \
+			--without-threestone --with-regex-library=posix --with-decimal=none \
+			--with-www=xml \
+			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+			$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
+			$(if $(filter NO,$(SYSTEM_LIBXSLT)),--with-xslt-config=$(OUTDIR)/bin/xslt-config) \
+			$(if $(filter NO,$(SYSTEM_LIBXML)), \
+			LIBXML2LIB=-lxml2 --with-xml2-config=$(OUTDIR)/bin/xml2-config) \
+		&& $(MAKE) \
+	)
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index 01d327011b1a..c6397dbdc9f0 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -21,41 +21,41 @@ $(eval $(call gb_ExternalProject_register_targets,rasqal,\
 
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,rasqal,build):
-	cd $(EXTERNAL_WORKDIR) \
-	&& CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
-	LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \
-	LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
-	XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
-	OBJDUMP="$(HOST_PLATFORM)-objdump" \
-	./configure --disable-static --enable-shared --disable-gtk-doc --with-openssl-digests \
-	--with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql \
-	--without-postgresql --without-threestore \
-	--disable-pcre --with-decimal=none --with-www=xml \
-	--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
-	lt_cv_cc_dll_switch="-shared" \
-	&& $(MAKE) \
-	&& touch $@
+	$(call gb_ExternalProject_run,build,\
+		CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+		LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \
+		LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
+		XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
+		OBJDUMP="$(HOST_PLATFORM)-objdump" \
+		./configure --disable-static --enable-shared --disable-gtk-doc --with-openssl-digests \
+			--with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql \
+			--without-postgresql --without-threestore \
+			--disable-pcre --with-decimal=none --with-www=xml \
+			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+			lt_cv_cc_dll_switch="-shared" \
+		&& $(MAKE) \
+	)
 else
 $(call gb_ExternalProject_get_state_target,rasqal,build):
-	cd $(EXTERNAL_WORKDIR) \
-	&& CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
-	PATH="$(OUTDIR)/bin:$$PATH" \
-	LDFLAGS="-L$(OUTDIR)/lib \
+	$(call gb_ExternalProject_run,build,\
+		CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
+		PATH="$(OUTDIR)/bin:$$PATH" \
+		LDFLAGS="-L$(OUTDIR)/lib \
 		$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \
 		$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \
 		$(if $(filter MACOSXNO,$(OS)$(SYSTEM_LIBXML)),-Wl$(COMMA)-dylib_file$(COMMA)@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib)" \
-	CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
-	./configure --disable-gtk-doc --with-threads --with-openssl-digests \
-	--with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql \
-	--without-postgresql --without-threestone --with-regex-library=posix \
-	--with-decimal=none --with-www=xml \
-	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-	$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
-	$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
-	&& $(MAKE) \
-	$(if $(filter MACOSX,$(OS)),&& $(PERL) \
+		CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
+		./configure --disable-gtk-doc --with-threads --with-openssl-digests \
+			--with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql \
+			--without-postgresql --without-threestone --with-regex-library=posix \
+			--with-decimal=none --with-www=xml \
+			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+			$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
+		&& $(MAKE) \
+			$(if $(filter MACOSX,$(OS)),&& $(PERL) \
             $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
             $(gb_Package_SOURCEDIR_rasqal)/src/.libs/librasqal-lo.1.dylib) \
-	&& touch $@
+	)
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index 0b35b8f8692e..609827b96ae8 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -24,46 +24,46 @@ $(eval $(call gb_ExternalProject_register_targets,redland,\
 
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,redland,build):
-	cd $(EXTERNAL_WORKDIR) \
-	&& CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
-	LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \
-	LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
-	XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
-	OBJDUMP="$(HOST_PLATFORM)-objdump" \
-	./configure --disable-static --disable-gtk-doc --with-openssl-digests \
-	--with-xml-parser=libxml --with-raptor=system --with-rasqal=system \
-	--without-bdb --without-sqlite --without-mysql --without-postgresql \
-	--without-threestore --with-regex-library=posix --with-decimal=none \
-	--with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
-	lt_cv_cc_dll_switch="-shared" \
-	&& cd librdf \
-	&& $(MAKE) \
-	&& touch $@
+	$(call gb_ExternalProject_run,build,\
+		CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+		LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \
+		LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
+		XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
+		OBJDUMP="$(HOST_PLATFORM)-objdump" \
+		./configure --disable-static --disable-gtk-doc --with-openssl-digests \
+			--with-xml-parser=libxml --with-raptor=system --with-rasqal=system \
+			--without-bdb --without-sqlite --without-mysql --without-postgresql \
+			--without-threestore --with-regex-library=posix --with-decimal=none \
+			--with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+			lt_cv_cc_dll_switch="-shared" \
+		&& cd librdf \
+		&& $(MAKE) \
+	)
 else
 $(call gb_ExternalProject_get_state_target,redland,build):
-	cd $(EXTERNAL_WORKDIR) \
-	&& CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
-	PATH="$(OUTDIR)/bin:$$PATH" \
-	LDFLAGS="-L$(OUTDIR)/lib \
+	$(call gb_ExternalProject_run,build,\
+		CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
+		PATH="$(OUTDIR)/bin:$$PATH" \
+		LDFLAGS="-L$(OUTDIR)/lib \
 		$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \
 		$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \
 		$(if $(filter MACOSX,$(OS)), -Wl$(COMMA)-dylib_file$(COMMA)@loader_path/libraptor-lo.1.dylib:$(OUTDIR)/lib/libraptor-lo.1.dylib \
 		$(if $(filter NO,$(SYSTEM_LIBXML)),-Wl$(COMMA)-dylib_file$(COMMA)@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib))" \
-	CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
-	./configure --disable-gtk-doc --with-openssl-digests \
-	--with-xml-parser=libxml --with-raptor=system --with-rasqal=system \
-	--without-bdb --without-sqlite --without-mysql --without-postgresql \
-	--without-threestone --with-regex-library=posix --with-decimal=none \
-	--with-www=xml \
-	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-	$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
-	$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
-	$(if $(filter-out ANDROID,$(OS)),--with-threads) \
-	&& cd librdf \
-	&& $(MAKE) \
-	$(if $(filter MACOSX,$(OS)),&& $(PERL) \
+		CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
+		./configure --disable-gtk-doc --with-openssl-digests \
+			--with-xml-parser=libxml --with-raptor=system --with-rasqal=system \
+			--without-bdb --without-sqlite --without-mysql --without-postgresql \
+			--without-threestone --with-regex-library=posix --with-decimal=none \
+			--with-www=xml \
+			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+			$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
+			$(if $(filter-out ANDROID,$(OS)),--with-threads) \
+		&& cd librdf \
+		&& $(MAKE) \
+			$(if $(filter MACOSX,$(OS)),&& $(PERL) \
             $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
             $(gb_Package_SOURCEDIR_redland)/librdf/.libs/librdf-lo.0.dylib) \
-	&& touch $@
+	)
 endif
 # vim: set noet sw=4 ts=4: