[Libreoffice-commits] core.git: RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 5b66024c117f2c354dda5c928f09d4cc21403b51
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jul 28 10:38:49 2014 +0200

    make sure ICU libs are available when needed
    
    Change-Id: I56faa8f0b1567a4e45cafc8edff17423b1e29c35

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 15bd09b..f10c68f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3760,7 +3760,10 @@ else # ! SYSTEM_LIBXML_FOR_BUILD
 
 define gb_ExternalExecutable__register_xmllint
 $(call gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if $(filter MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build),xml2)
-$(call gb_ExternalExecutable_add_dependencies,xmllint,$(call gb_Package_get_target,xml2))
+$(call gb_ExternalExecutable_add_dependencies,xmllint,\
+	$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \
+	$(call gb_Package_get_target,xml2) \
+)
 
 endef
 
@@ -3774,7 +3777,10 @@ else # ! SYSTEM_LIBXSLT_FOR_BUILD
 
 define gb_ExternalExecutable__register_xsltproc
 $(call gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if $(filter MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),xslt)
-$(call gb_ExternalExecutable_add_dependencies,xsltproc,$(call gb_Package_get_target,xslt))
+$(call gb_ExternalExecutable_add_dependencies,xsltproc,\
+	$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \
+	$(call gb_Package_get_target,xslt) \
+)
 
 endef