libxml2, libxslt: use executables from WORKDIR

Change-Id: I1324c8f21e31c69b9780136cc777e1aea3bc546e

4 files changed, 9 insertions, 27 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a01bc5c723e0..d43be9f38f4c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3032,7 +3032,8 @@ gb_ExternalExecutable__register_xmllint :=
 else # ! SYSTEM_LIBXML_FOR_BUILD
 
 define gb_ExternalExecutable__register_xmllint
-$(call gb_ExternalExecutable_set_internal,xmllint,$(OUTDIR_FOR_BUILD)/bin/xmllint$(gb_Executable_EXT_for_build))
+$(call gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if $(filter MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build))
+$(call gb_ExternalExecutable_add_dependencies,xmllint,$(call gb_Package_get_target,xml2))
 
 endef
 
@@ -3045,7 +3046,7 @@ gb_ExternalExecutable__register_xsltproc :=
 else # ! SYSTEM_LIBXSLT_FOR_BUILD
 
 define gb_ExternalExecutable__register_xsltproc
-$(call gb_ExternalExecutable_set_internal,xsltproc,$(OUTDIR_FOR_BUILD)/bin/xsltproc$(gb_Executable_EXT_for_build))
+$(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))
 $(call gb_ExternalExecutable_add_dependencies,xsltproc,$(call gb_Package_get_target,xslt))
 
 endef
diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk
index a89e4a505d73..69a6e886dfb6 100644
--- a/external/libxml2/ExternalPackage_xml2.mk
+++ b/external/libxml2/ExternalPackage_xml2.mk
@@ -11,28 +11,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xml2,xml2))
 
 $(eval $(call gb_ExternalPackage_use_external_project,xml2,xml2))
 
-ifneq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xml2-config,xml2-config))
-endif
-
+ifneq ($(DISABLE_DYNLOADING),TRUE)
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.2.dylib,.libs/libxml2.2.dylib,xml2))
-$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint))
-else ifeq ($(DISABLE_DYNLOADING),TRUE)
-ifneq ($(CROSS_COMPILING),YES)
-$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint))
-endif
 else ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
 $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,.libs/libxml2.dll,xml2))
-$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint.exe,.libs/xmllint.exe))
 else # COM=MSC
 $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,win32/bin.msvc/libxml2.dll,xml2))
-$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint.exe,win32/bin.msvc/xmllint.exe))
 endif
 else # OS!=WNT
 $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.so.2,.libs/libxml2.so.2.7.6,xml2))
-$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint))
 endif
+endif # DISABLE_DYNLOADING
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk
index d91b509aada9..d645ed3640c6 100644
--- a/external/libxslt/ExternalPackage_xslt.mk
+++ b/external/libxslt/ExternalPackage_xslt.mk
@@ -11,32 +11,22 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xslt,xslt))
 
 $(eval $(call gb_ExternalPackage_use_external_project,xslt,xslt))
 
-ifneq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xslt-config,xslt-config))
-endif
-
+ifneq ($(DISABLE_DYNLOADING),TRUE)
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.1.dylib,libxslt/.libs/libxslt.1.dylib))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.0.dylib,libexslt/.libs/libexslt.0.dylib))
-$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc))
-else ifeq ($(DISABLE_DYNLOADING),TRUE)
-ifneq ($(CROSS_COMPILING),YES)
-$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/xsltproc))
-endif
 else ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
 $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libxslt.dll,libxslt/.libs/libxslt.dll))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,libexslt/.libs/libexslt.dll))
-$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,xsltproc/.libs/xsltproc.exe))
 else # COM=MSC
 $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libxslt.dll,win32/bin.msvc/libxslt.dll))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,win32/bin.msvc/libexslt.dll))
-$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,win32/bin.msvc/xsltproc.exe))
 endif
 else # OS!=WNT
 $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.26))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.15))
-$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc))
 endif
+endif # DISABLE_DYNLOADING
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/ExternalExecutable.mk b/solenv/gbuild/ExternalExecutable.mk
index 0d2a8cc13ce7..770dd3a772e3 100644
--- a/solenv/gbuild/ExternalExecutable.mk
+++ b/solenv/gbuild/ExternalExecutable.mk
@@ -111,9 +111,10 @@ endef
 
 # FIXME need to subst in some more $$ in gb_Helper_set_ld_path here - ugly
 # but other uses (gb_CppunitTest_CPPTESTPRECOMMAND) require less $$ - ugly
+# FIXME hack to avoid dependency into workdir - those must be added explicitly
 define gb_ExternalExecutable__set_internal
 gb_ExternalExecutable_$(1)_EXECUTABLE := $(2)
-gb_ExternalExecutable_$(1)_DEPENDENCIES := $(2)
+gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(findstring $(WORKDIR_FOR_BUILD),$(2)),,$(2))
 gb_ExternalExecutable_$(1)_PRECOMMAND := $(subst $$,$$$$,$(gb_Helper_set_ld_path))
 
 endef