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 /libxmlsec | |
| 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 'libxmlsec')
| -rw-r--r-- | libxmlsec/ExternalProject_xmlsec.mk | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index a0b182b6264c..c589e3d2907d 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -21,43 +21,43 @@ ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(call gb_ExternalProject_get_state_target,xmlsec,build) : - cd $(EXTERNAL_WORKDIR) \ - && autoreconf \ - && ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ - --without-libxslt --without-openssl --without-gnutls --disable-crypto-dl \ - $(if $(filter NO,$(SYSTEM_NSS)),--disable-pkgconfig) \ - CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ - LDFLAGS="-Wl,--no-undefined $(ILIB:;= -L)" \ - LIBS="$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED__LIBSTDCPP))" \ - && $(MAKE) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + autoreconf \ + && ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + --without-libxslt --without-openssl --without-gnutls --disable-crypto-dl \ + $(if $(filter NO,$(SYSTEM_NSS)),--disable-pkgconfig) \ + CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ + LDFLAGS="-Wl,--no-undefined $(ILIB:;= -L)" \ + LIBS="$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED__LIBSTDCPP))" \ + && $(MAKE) \ + ) else $(call gb_ExternalProject_get_state_target,xmlsec,build) : - cd $(EXTERNAL_WORKDIR)/win32 \ - && cscript configure.js crypto=mscrypto xslt=no iconv=no static=no \ - $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ - && unset MAKEFLAGS \ - && LIB="$(ILIB)" nmake \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + cscript configure.js crypto=mscrypto xslt=no iconv=no static=no \ + $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ + && unset MAKEFLAGS \ + && LIB="$(ILIB)" nmake \ + ,win32) endif else $(call gb_ExternalProject_get_state_target,xmlsec,build) : - cd $(EXTERNAL_WORKDIR) \ - && $(if $(filter MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") autoreconf \ - && ./configure \ - --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \ - $(if $(filter ANDROID,$(OS)),--with-openssl=$(OUTDIR),--without-openssl) \ - $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \ - LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl,-z,origin -Wl,-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib),\ - $(if $(filter-out MACOSX,$(OS)),,LDFLAGS="-Wl,-dylib_file,@executable_path/libnssutil3.dylib:$(OUTDIR)/lib/libnssutil3.dylib")) \ - && $(MAKE) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + $(if $(filter MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") autoreconf \ + && ./configure \ + --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \ + $(if $(filter ANDROID,$(OS)),--with-openssl=$(OUTDIR),--without-openssl) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \ + LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl,-z,origin -Wl,-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib),\ + $(if $(filter-out MACOSX,$(OS)),,LDFLAGS="-Wl,-dylib_file,@executable_path/libnssutil3.dylib:$(OUTDIR)/lib/libnssutil3.dylib")) \ + && $(MAKE) \ + ) endif |