summaryrefslogtreecommitdiff
path: root/openldap
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 /openldap
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 'openldap')
-rw-r--r--openldap/ExternalProject_openldap.mk45
1 files changed, 23 insertions, 22 deletions
diff --git a/openldap/ExternalProject_openldap.mk b/openldap/ExternalProject_openldap.mk
index e55296ad3f10..294bd07849fb 100644
--- a/openldap/ExternalProject_openldap.mk
+++ b/openldap/ExternalProject_openldap.mk
@@ -16,27 +16,28 @@ $(eval $(call gb_ExternalProject_register_targets,openldap,\
))
$(call gb_ExternalProject_get_state_target,openldap,build) :
- cd $(EXTERNAL_WORKDIR) \
- && ./configure \
- --disable-slapd \
- --with-pic \
- --with-tls=moznss \
- --without-cyrus-sasl \
- --disable-shared \
- --enable-static \
- $(if $(filter YES,$(CROSS_COMPILING)), \
- --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
- --with-yielding_select=yes \
- ac_cv_func_memcmp_working=yes \
- ) \
- $(if $(filter YES,$(SYSTEM_NSS)), \
- CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)" \
- , \
- CPPFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include" \
- CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include" \
- LDFLAGS="-L$(OUTDIR)/lib" \
- ) \
- && MAKEFLAGS= && $(MAKE) \
- && touch $@
+ $(call gb_ExternalProject_run,build,\
+ ./configure \
+ --disable-slapd \
+ --with-pic \
+ --with-tls=moznss \
+ --without-cyrus-sasl \
+ --disable-shared \
+ --enable-static \
+ $(if $(filter YES,$(CROSS_COMPILING)), \
+ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+ --with-yielding_select=yes \
+ ac_cv_func_memcmp_working=yes \
+ ) \
+ $(if $(filter YES,$(SYSTEM_NSS)), \
+ CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)" \
+ , \
+ CPPFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include" \
+ CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include" \
+ LDFLAGS="-L$(OUTDIR)/lib" \
+ ) \
+ && MAKEFLAGS= && $(MAKE) \
+ )
+
# vim: set noet sw=4 ts=4: