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 /libxslt | |
| 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 'libxslt')
| -rw-r--r-- | libxslt/ExternalProject_xslt.mk | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/libxslt/ExternalProject_xslt.mk b/libxslt/ExternalProject_xslt.mk index b64eb935c73d..e468267758ae 100644 --- a/libxslt/ExternalProject_xslt.mk +++ b/libxslt/ExternalProject_xslt.mk @@ -19,40 +19,40 @@ $(eval $(call gb_ExternalProject_register_targets,xslt,\ ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(call gb_ExternalProject_get_state_target,xslt,build): - cd $(EXTERNAL_WORKDIR) \ - && ./configure --without-crypto --without-python --disable-static \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ - $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \ - LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2" \ - OBJDUMP=objdump \ - && chmod 777 xslt-config \ - && $(MAKE) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + ./configure --without-crypto --without-python --disable-static \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ + $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \ + LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2" \ + OBJDUMP=objdump \ + && chmod 777 xslt-config \ + && $(MAKE) \ + ) else # COM=MSC $(call gb_ExternalProject_get_state_target,xslt,build): - cd $(EXTERNAL_WORKDIR)/win32 \ - && cscript configure.js \ - && unset MAKEFLAGS \ - && LIB="$(ILIB)" nmake \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + cscript configure.js \ + && unset MAKEFLAGS \ + && LIB="$(ILIB)" nmake \ + ,win32) endif else # OS!=WNT $(call gb_ExternalProject_get_state_target,xslt,build): - cd $(EXTERNAL_WORKDIR) \ - && ./configure --without-crypto --without-python \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - LDFLAGS="$(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 SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ - $(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)), \ - $(if $(filter IOS,$(OS)),LIBS="-liconv") \ - --disable-shared,--disable-static) \ - $(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR) LIBXML2LIB=-lxml2) \ - && chmod 777 xslt-config \ - && $(MAKE) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + ./configure --without-crypto --without-python \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + LDFLAGS="$(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 SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ + $(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)), \ + $(if $(filter IOS,$(OS)),LIBS="-liconv") \ + --disable-shared,--disable-static) \ + $(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR) LIBXML2LIB=-lxml2) \ + && chmod 777 xslt-config \ + && $(MAKE) \ + ) endif # vim: set noet sw=4 ts=4: |