[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - external/libcdr external/libqxp
Christian Lohmaier (via logerrit)
logerrit at kemper.freedesktop.org
Thu May 23 16:53:47 UTC 2019
external/libcdr/ExternalProject_libcdr.mk | 1 +
external/libqxp/ExternalProject_libqxp.mk | 1 +
2 files changed, 2 insertions(+)
New commits:
commit cc318bd131ac1e78a3617b028d533dfab1941aac
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Wed May 22 12:20:34 2019 +0200
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Thu May 23 18:52:59 2019 +0200
libcdr & libqxp: follow main configure's --diable-dependency-tracking
Change-Id: I363a02d7115ea54bb4aedb38071a249e145ee471
Reviewed-on: https://gerrit.libreoffice.org/72742
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
(cherry picked from commit ae03c889c900c8ae0d015e096d1e90b197bb1f5d)
Reviewed-on: https://gerrit.libreoffice.org/72829
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk
index c82579937e1e..5e895a5fc1e3 100644
--- a/external/libcdr/ExternalProject_libcdr.mk
+++ b/external/libcdr/ExternalProject_libcdr.mk
@@ -35,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
+ $(if $(gb_FULLDEPS),,--disable-dependency-tracking) \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
diff --git a/external/libqxp/ExternalProject_libqxp.mk b/external/libqxp/ExternalProject_libqxp.mk
index d2627c021602..04a34b57e4be 100644
--- a/external/libqxp/ExternalProject_libqxp.mk
+++ b/external/libqxp/ExternalProject_libqxp.mk
@@ -34,6 +34,7 @@ $(call gb_ExternalProject_get_state_target,libqxp,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
+ $(if $(gb_FULLDEPS),,--disable-dependency-tracking) \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
More information about the Libreoffice-commits
mailing list