diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-21 08:15:39 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-22 08:25:56 +0000 |
| commit | ed26c01be15ebc9031ee5ef709d88d524f0fc16d (patch) | |
| tree | 1629e51b40fe52a3cc85795dd34c5f08b9483458 /xpdf | |
| parent | c04c95958030bd4872fbbc0b3d4bc996fb041488 (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 'xpdf')
| -rw-r--r-- | xpdf/ExternalProject_xpdf.mk | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/xpdf/ExternalProject_xpdf.mk b/xpdf/ExternalProject_xpdf.mk index 3ad1d9c5f558..31a1a0a50866 100644 --- a/xpdf/ExternalProject_xpdf.mk +++ b/xpdf/ExternalProject_xpdf.mk @@ -18,29 +18,30 @@ $(eval $(call gb_ExternalProject_register_targets,xpdf,\ ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(call gb_ExternalProject_get_state_target,xpdf,build): - cd $(EXTERNAL_WORKDIR) \ - && ./configure --without-x --enable-multithreaded --enable-exceptions \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2" \ - LIBS="-lgdi32" \ - && $(MAKE) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + ./configure --without-x --enable-multithreaded --enable-exceptions \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2" \ + LIBS="-lgdi32" \ + && $(MAKE) \ + ) else # COM=MSC $(call gb_ExternalProject_get_state_target,xpdf,build): - cd $(EXTERNAL_WORKDIR) \ - && LIB="$(ILIB)" cmd.exe /d /c ms_make.bat \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + LIB="$(ILIB)" cmd.exe /d /c ms_make.bat \ + ) endif else # OS!=WNT $(call gb_ExternalProject_get_state_target,xpdf,build): - cd $(EXTERNAL_WORKDIR) \ - && ./configure --without-x --without-libpaper-library --without-t1-library --enable-multithreaded --enable-exceptions \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - $(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include") \ - $(if $(filter MACOSXP,$(OS)$(CPU)),CXXFLAGS="-malign-natural") \ - && MAKEFLAGS="$(subst r,,$(MAKEFLAGS))" $(MAKE) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + ./configure --without-x --without-libpaper-library --without-t1-library --enable-multithreaded --enable-exceptions \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include") \ + $(if $(filter MACOSXP,$(OS)$(CPU)),CXXFLAGS="-malign-natural") \ + && MAKEFLAGS="$(subst r,,$(MAKEFLAGS))" $(MAKE) \ + ) + endif # vim: set noet sw=4 ts=4: |