[Libreoffice-commits] core.git: solenv/gbuild

[Samuel Thibault]

 solenv/gbuild/UIConfig.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f927fc06b8160c6db134b29dab510e2cd567e3f3
Author: Samuel Thibault <sthibault at hypra.fr>
Date:   Fri Mar 2 09:20:43 2018 +0100

    gla11y: do not trigger lxml externalpackage build when system-provided
    
    if there was no other external package built already, even just touching
    lxml.done would fail.
    
    Change-Id: I8b3ad63477421d797f2d6eb07b88c86041a5a1af
    Reviewed-on: https://gerrit.libreoffice.org/50614
    Reviewed-by: Rene Engelhard <rene at debian.org>
    Tested-by: Rene Engelhard <rene at debian.org>

diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index c5a04e33ab56..9a88ffd44498 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -97,6 +97,7 @@ gb_UIConfig_INSTDIR := $(LIBO_SHARE_FOLDER)/config/soffice.cfg
 
 ifneq ($(filter LXML,$(BUILD_TYPE)),)
 gb_UIConfig_LXML_PATH := PYPATH=$${PYPATH:+$$PYPATH:}$(call gb_UnpackedTarball_get_dir,lxml)/install ;
+gb_UIConfig_LXML_TARGET := $(call gb_ExternalProject_get_target,lxml)
 endif
 gb_UIConfig_gla11y_SCRIPT := $(SRCDIR)/bin/gla11y
 
@@ -134,7 +135,7 @@ $(call gb_Output_announce,$(2),$(true),UIA,1)
 $(call gb_UIConfig__gla11y_command)
 endef
 
-$(call gb_UIConfig_get_a11yerrors_target,%) : $(call gb_ExternalProject_get_target,lxml) $(call gb_ExternalExecutable_get_dependencies,python) $(gb_UIConfig_gla11y_SCRIPT)
+$(call gb_UIConfig_get_a11yerrors_target,%) : $(gb_UIConfig_LXML_TARGET) $(call gb_ExternalExecutable_get_dependencies,python) $(gb_UIConfig_gla11y_SCRIPT)
 	$(call gb_UIConfig_a11yerrors__command,$@,$*)
 
 gb_UIConfig_get_packagename = UIConfig/$(1)