[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - external/libabw external/libvisio

[Christian Lohmaier (via logerrit)]

 external/libabw/ExternalProject_libabw.mk     |    1 +
 external/libvisio/ExternalProject_libvisio.mk |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit ff18b6750c35b1b6931dfa057173d84c3bd9dc62
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Tue Aug 27 14:12:32 2019 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Fri Sep 6 18:37:51 2019 +0200

    libabw, libvisio: follow main configure's --disable-dependency-tracking
    
    Change-Id: Iaf4fd40a7178b50a396971cfcfd0c39211597285
    (cherry picked from commit 3005c107f356ead72d18b5136361e75d82ab1dff)

diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk
index c8c2bd2e9882..4f71a5739a3b 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -34,6 +34,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
 			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
 			--disable-werror \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(gb_FULLDEPS),,--disable-dependency-tracking) \
 			CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
 			CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index 668e30190988..8f34290a8e6e 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -35,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
 			--disable-werror \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(gb_FULLDEPS),,--disable-dependency-tracking) \
 			CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
 			CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \