[Libreoffice-commits] core.git: 4 commits - external/Module_external.mk RepositoryModule_build.mk solenv/gbuild

[David Tardon]

 RepositoryModule_build.mk                  |    1 +
 external/Module_external.mk                |    4 ++--
 solenv/gbuild/Module.mk                    |    3 ++-
 solenv/gbuild/extensions/pre_BuildTools.mk |    2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 878f669c405bd5f83195fd1d6459f4e4c31832a2
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 3 08:05:16 2013 +0100

    fix target name
    
    Change-Id: Icdc912c8d36fe75bedb5a3744018b5d100f45f21

diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk
index c9264ff..929a46b 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -43,6 +43,6 @@ gb_BUILD_TOOLS = \
 	$(foreach executable, \
 		xsltproc \
 	,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \
-	$(call gb_Helper_optional_for_host,DESKTOP,Package_xmlhelp_xsl) \
+	$(call gb_Helper_optional_for_host,DESKTOP,$(call gb_Package_get_target,xmlhelp_xsl)) \
 
 # vim: set noet sw=4 ts=4:
commit a0786fa28027de9d112d6945cc32ab6fd224e838
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 3 08:02:04 2013 +0100

    it seems we need svgio too
    
    Change-Id: Iff6165fd440150bdd325c54e41df529bd5349df2

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index d656714..18ea8bc 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 			package \
 			sfx2 \
 			sot \
+			svgio \
 			svl \
 			svtools \
 			svx \
commit 16685f24f14c29f5aad2dc30cb73ab522dcb3cee
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 3 07:50:57 2013 +0100

    duplicates in the module list break build
    
    They might occur in extensions when crosscompiling, because both
    harfbuzz and lcms2 are listed twice.
    
    Change-Id: I6d6eff19043d33160b825f47988e46798da7857a

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 98930ed..8105c1f 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -280,7 +280,8 @@ $(foreach target,$(2),$(call gb_Module_add_subsequentcheck_target,$(1),$(target)
 endef
 
 define gb_Module_add_moduledirs
-$(foreach target,$(2),$(call gb_Module_add_moduledir,$(1),$(target)))
+$(foreach target,$(sort $(2)),$(call gb_Module_add_moduledir,$(1),$(target)))
+
 endef
 
 define gb_Module_make_global_targets
commit a5f90dcdb829b78719eba79ad23907a4bc61e82f
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 3 07:47:39 2013 +0100

    still need to test if the libs should be built internally
    
    Change-Id: I66c6d4bf8100b830fd2d315f548dc3e77a95b9d5

diff --git a/external/Module_external.mk b/external/Module_external.mk
index 02c4f75..feee429 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -69,8 +69,8 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,WPS,libwps) \
 	$(call gb_Helper_optional_for_host,DESKTOP, \
 		$(if $(filter YES,$(WITH_GALLERY_BUILD)), \
-			harfbuzz \
-			lcms2 \
+			$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
+			$(call gb_Helper_optional,LCMS2,lcms2) \
 		) \
 	) \
 ))