[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - RepositoryExternal.mk unotest/Library_unobootstrapprotector.mk

[Michael Stahl]

 RepositoryExternal.mk                    |    1 +
 unotest/Library_unobootstrapprotector.mk |    5 +++++
 2 files changed, 6 insertions(+)

New commits:
commit e839377f55d2c7f58eabf01c1609e49dff827a3a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Apr 28 13:32:28 2015 +0200

    RepositoryExternal.mk: gengal needs runtime dependency on unorc
    
    (cherry picked from commit ae08fceafc47279d17d6e1d002cbcd574b7bf028)
    
    unotest: unobootstrapprotector needs runtime dependency on unorc
    
    Change-Id: Ie6ed784bb9676b9de8a51762aa58d0c75e071cfd
    (cherry picked from commit 7289ee9b9ce2346fa58dfa7c2f2b318f6db40d4d)
    Reviewed-on: https://gerrit.libreoffice.org/15558
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 47f6e90..7b70da8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3755,6 +3755,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
 	)) \
 	$(call gb_Package_get_target_for_build,postprocess_images) \
 	$(call gb_Package_get_target_for_build,postprocess_registry) \
+	$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
 	$(call gb_Rdb_get_target_for_build,ure/services) \
 	$(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
 	$(call gb_UnoApi_get_target,offapi) \
diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk
index cb32bf9..3ec8b16 100644
--- a/unotest/Library_unobootstrapprotector.mk
+++ b/unotest/Library_unobootstrapprotector.mk
@@ -29,4 +29,9 @@ $(eval $(call gb_Library_add_exception_objects,unobootstrapprotector,\
 	unotest/source/cpp/unobootstrapprotector/unobootstrapprotector \
 ))
 
+# runtime dependency: needs unorc/uno.ini
+$(eval $(call gb_Library_use_package,unobootstrapprotector,\
+	instsetoo_native_setup_ure \
+))
+
 # vim: set noet sw=4 ts=4: