idl/Executable_svidl.mk | 5 ----- l10ntools/Executable_helpex.mk | 1 - l10ntools/Executable_xrmex.mk | 1 - rsc/Executable_rsc.mk | 6 ------ solenv/gbuild/ExternalPackage.mk | 2 +- 5 files changed, 1 insertion(+), 14 deletions(-)
New commits: commit a107908e7e5d135e43aaa11d6face7d153ef20f7 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Wed Sep 25 08:59:04 2013 +0200 Revert "More ICU dependencies that are now dragged in" Should be fixed by 913f83ac52629a524c373d2504a0cb349446b371 This reverts commits 4dd261e526f43a364c645e7022c49b61c8001a39 30d7729586a60bef061261e9e59bf44768cc0196 4e2e1ca76f772d4644a21b82f79dfb4412a9c99f diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index c3c52a4..b2b3ecd 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -34,11 +34,6 @@ $(eval $(call gb_Executable_use_libraries,svidl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_use_externals,svidl,\ - icudata \ - icuuc \ - icui18n \ -)) $(eval $(call gb_Executable_add_exception_objects,svidl,\ idl/source/cmptools/hash \ idl/source/cmptools/lex \ diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk index 0118671..c7f5cce 100644 --- a/l10ntools/Executable_helpex.mk +++ b/l10ntools/Executable_helpex.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Executable_use_externals,helpex,\ boost_headers \ icu_headers \ libxml2 \ - icudata \ icuuc \ icui18n \ )) diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk index d4dc6a2..109198d 100644 --- a/l10ntools/Executable_xrmex.mk +++ b/l10ntools/Executable_xrmex.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Executable_add_exception_objects,xrmex,\ $(eval $(call gb_Executable_use_externals,xrmex,\ boost_headers \ libxml2 \ - icudata \ icuuc \ icui18n \ icu_headers \ diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index aab0322..ed779e6 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -30,12 +30,6 @@ $(eval $(call gb_Executable_use_libraries,rsc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_use_externals,rsc,\ - icudata \ - icuuc \ - icui18n \ -)) - $(eval $(call gb_Executable_add_grammars,rsc,\ rsc/source/parser/rscyacc \ )) commit 406b9a7c71da58a305e22e3ab2f74a26a44b141c Author: Matúš Kukan <matus.ku...@gmail.com> Date: Wed Sep 25 08:53:09 2013 +0200 gbuild: fix ExternalPackage dependencies for files in instdir Change-Id: Ia46119dea124a6260a12504651d6f766d0285985 diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk index 19fea8d..5eb5231 100644 --- a/solenv/gbuild/ExternalPackage.mk +++ b/solenv/gbuild/ExternalPackage.mk @@ -198,7 +198,7 @@ endef define gb_ExternalPackage__add_file_for_install $(call gb_ExternalPackage_add_file,$(1),$(2),$(4)) -$(call gb_Helper_install,$(call gb_ExternalPackage_get_target,$(1)), \ +$(call gb_Helper_install,$(call gb_Package_get_target,$(1)), \ $(3), \ $(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(4))
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits