summaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2013-02-21 08:15:39 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2013-02-22 08:25:56 +0000
commited26c01be15ebc9031ee5ef709d88d524f0fc16d (patch)
tree1629e51b40fe52a3cc85795dd34c5f08b9483458 /fontconfig
parentc04c95958030bd4872fbbc0b3d4bc996fb041488 (diff)
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>
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/ExternalProject_fontconfig.mk20
1 files changed, 10 insertions, 10 deletions
diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk
index d882ecf0c163..a09e9234e575 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -20,16 +20,16 @@ $(eval $(call gb_ExternalProject_register_targets,fontconfig,\
))
$(call gb_ExternalProject_get_state_target,fontconfig,build) :
- cd $(EXTERNAL_WORKDIR) \
- && CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" $(if $(filter ANDROID,$(OS)),LIBS="-lm") \
+ $(call gb_ExternalProject_run,build,\
+ CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" $(if $(filter ANDROID,$(OS)),LIBS="-lm") \
./configure \
- --disable-shared \
- --with-arch=arm \
- --with-expat-includes=$(OUTDIR)/inc/external/expat \
- --with-expat-lib=$(OUTDIR)/lib \
- --with-freetype-config=$(OUTDIR)/bin/freetype-config \
- --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
- && $(MAKE) \
- && touch $@
+ --disable-shared \
+ --with-arch=arm \
+ --with-expat-includes=$(OUTDIR)/inc/external/expat \
+ --with-expat-lib=$(OUTDIR)/lib \
+ --with-freetype-config=$(OUTDIR)/bin/freetype-config \
+ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+ && $(MAKE) \
+ )
# vim: set noet sw=4 ts=4: