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 /openssl | |
| 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 'openssl')
| -rw-r--r-- | openssl/ExternalProject_openssl.mk | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk index 9f1210b495d1..954fc2b652f2 100644 --- a/openssl/ExternalProject_openssl.mk +++ b/openssl/ExternalProject_openssl.mk @@ -35,34 +35,35 @@ OPENSSL_PLATFORM := $(if $(filter LINUX FREEBSD ANDROID,$(OS)),\ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,openssl,build): - cd $(EXTERNAL_WORKDIR) \ - && export CC="$(shell cygpath -w $(CC))" \ - && export PERL="$(shell cygpath -w $(PERL))" \ - && export LIB="$(ILIB)" \ - && $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \ - && cmd /c "ms\do_ms.bat $(PERL) $(OPENSSL_PLATFORM)" \ - && unset MAKEFLAGS \ - && nmake -f "ms\ntdll.mak" \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + export CC="$(shell cygpath -w $(CC))" \ + && export PERL="$(shell cygpath -w $(PERL))" \ + && export LIB="$(ILIB)" \ + && $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \ + && cmd /c "ms\do_ms.bat $(PERL) $(OPENSSL_PLATFORM)" \ + && unset MAKEFLAGS \ + && nmake -f "ms\ntdll.mak" \ + ) + else $(call gb_ExternalProject_get_state_target,openssl,build): - cd $(EXTERNAL_WORKDIR) \ - && MAKE="$(MAKE) -j1" \ - $(if $(filter LINUX FREEBSD ANDROID SOLARIS IOS,$(OS)),./Configure,\ - $(if $(filter WNT,$(OS)),$(PERL) Configure,./config)) \ - $(OPENSSL_PLATFORM) \ - $(if $(filter ANDROID,$(OS)),\ - shared no-idea,\ - $(if $(filter IOS,$(OS)),no-shared no-idea,\ - $(if $(filter WNT,$(OS)),shared,\ - shared no-idea \ - $(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)))) \ - $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - && export MAKEFLAGS="$(MAKEFLAGS:r=)" \ - && $(MAKE) -j1 build_libs \ - CC="$(CC) $(if $(filter-out WNT,$(OS)),\ - $(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\ - -fvisibility=hidden))" \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + MAKE="$(MAKE) -j1" \ + $(if $(filter LINUX FREEBSD ANDROID SOLARIS IOS,$(OS)),./Configure,\ + $(if $(filter WNT,$(OS)),$(PERL) Configure,./config)) \ + $(OPENSSL_PLATFORM) \ + $(if $(filter ANDROID,$(OS)),\ + shared no-idea,\ + $(if $(filter IOS,$(OS)),no-shared no-idea,\ + $(if $(filter WNT,$(OS)),shared,\ + shared no-idea \ + $(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)))) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + && export MAKEFLAGS="$(MAKEFLAGS:r=)" \ + && $(MAKE) -j1 build_libs \ + CC="$(CC) $(if $(filter-out WNT,$(OS)),\ + $(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\ + -fvisibility=hidden))" \ + ) endif # vim: set noet sw=4 ts=4: |