[Libreoffice-commits] core.git: 2 commits - Library_merged.mk RepositoryExternal.mk solenv/gbuild

[Matúš Kukan]

 Library_merged.mk            |    4 ++--
 RepositoryExternal.mk        |    4 ----
 solenv/gbuild/CppunitTest.mk |    1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit d20dff1409fc00e783519cfc0065c6311bb914fb
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Dec 3 08:23:16 2013 +0100

    Package cppuhelper_unorc does not exist.
    
    Change-Id: Ib80cdc1408c8784db066b35f27993f8521772a76

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3073c565..b44927e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3078,7 +3078,6 @@ endef
 define gb_Executable__register_climaker
 $(call gb_Executable_add_runtime_dependencies,climaker,\
 	$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
-	$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
 	$(call gb_Rdb_get_target_for_build,ure/services) \
 	$(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
 	$(call gb_UnoApi_get_target,udkapi) \
@@ -3112,7 +3111,6 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
 	$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \
 		$(call gb_Library_get_target,vclplug_svp) \
 	)) \
-	$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
 	$(call gb_Package_get_target_for_build,postprocess_registry) \
 	$(call gb_Rdb_get_target_for_build,ure/services) \
 	$(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
@@ -3152,7 +3150,6 @@ endef
 define gb_Executable__register_saxparser
 $(call gb_Executable_add_runtime_dependencies,saxparser,\
 	$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
-	$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
 	$(call gb_Rdb_get_target_for_build,saxparser) \
 	$(call gb_Rdb_get_target_for_build,ure/services) \
 	$(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
@@ -3167,7 +3164,6 @@ endef
 define gb_Executable__register_uno
 $(call gb_Executable_add_runtime_dependencies,uno,\
 	$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
-	$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
 	$(call gb_Rdb_get_target_for_build,ure/services) \
 	$(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
 	$(call gb_UnoApi_get_target,udkapi) \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 993757d..b3d6c96 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -156,7 +156,6 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,$(gb_CPPU_
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,affine_uno)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,unobootstrapprotector)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,unoexceptionprotector)
-$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,cppuhelper_unorc)
 
 endef
 
commit 5b03bc8a4d92fee2fdfdca4917b321985feb930a
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Mon Dec 2 20:53:54 2013 +0100

    ugly build-fix for libmerged
    
    Change-Id: I6c107ea5e780ea1178759e2ee827f9bd6d5ede3a

diff --git a/Library_merged.mk b/Library_merged.mk
index 1e96111..3490a8a 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -31,6 +31,8 @@ $(eval $(call gb_Library_use_libraries,merged,\
 ))
 
 $(eval $(call gb_Library_use_externals,merged,\
+	icui18n \
+	icuuc \
 	boostdatetime \
 	$(call gb_Helper_optional,DESKTOP,clucene) \
 	cups \
@@ -43,8 +45,6 @@ $(eval $(call gb_Library_use_externals,merged,\
 	$(if $(ENABLE_GTK),gtk) \
 	harfbuzz \
 	hunspell \
-	icui18n \
-	icuuc \
 	jpeg \
 	lcms2 \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \