[Libreoffice-commits] core.git: 2 commits - ios/experimental solenv/gbuild

[Tor Lillqvist]

 ios/experimental/LibreOffice/LibreOffice/lo.mm           |    4 --
 ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm |    4 --
 solenv/gbuild/Library.mk                                 |   21 +++++++++++++--
 3 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit 5ed55393ee0778840dd4b3a316086b48bd0c61fc
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Dec 20 12:27:36 2013 +0200

    Don't need Base, Calc, Draw and Math functionality here for now
    
    Change-Id: I20b9325f9c7eed1e49ea815c284f8fe1a6ed428d

diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index bfdbdc5..04760a7 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -22,10 +22,6 @@ lo_get_factory_map(void)
 {
     static lib_to_factory_mapping map[] = {
         LO_EXTENDED_CORE_FACTORY_MAP
-        LO_BASE_CORE_FACTORY_MAP
-        LO_CALC_FACTORY_MAP
-        LO_DRAW_CORE_FACTORY_MAP
-        LO_MATH_FACTORY_MAP
         LO_WRITER_FACTORY_MAP
         { "libcuilo.a", cui_component_getFactory },
         { "libspllo.a", spl_component_getFactory },
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
index 0eaea4e..755ff1a 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
@@ -22,10 +22,6 @@ lo_get_factory_map(void)
 {
     static lib_to_factory_mapping map[] = {
         LO_EXTENDED_CORE_FACTORY_MAP
-        LO_BASE_CORE_FACTORY_MAP
-        LO_CALC_FACTORY_MAP
-        LO_DRAW_CORE_FACTORY_MAP
-        LO_MATH_FACTORY_MAP
         LO_WRITER_FACTORY_MAP
         { "libcuilo.a", cui_component_getFactory },
         { "libspllo.a", spl_component_getFactory },
commit ea61ed8efe8d84b88754b1c6af0a85a76b3ce424
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Dec 20 11:20:45 2013 +0200

    Avoid unnecessary library re-building in the DISABLE_DYNLOADING case
    
    In the DISABLE_DYNLOADING case, a gbuild "Library" is actually a
    static archive, so no point in having it depend on other libraries and
    be re-created each time one of those have changed.
    
    This hopefully will speed up incremental rebuilds for iOS and Android
    nicely, especially in a debugging tree, as the creation of large
    static archives with debug information is quite slow.
    
    Change-Id: I17d6a8aeffa65b1e09a7a11544683659c72a50ba

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 61b5b0f..6ec8278 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -210,8 +210,6 @@ $(eval $(foreach method,\
 	use_internal_api \
 	use_internal_bootstrap_api \
 	use_internal_comprehensive_api \
-	use_libraries \
-	use_static_libraries \
 	use_external \
 	use_externals \
 	use_custom_headers \
@@ -231,4 +229,23 @@ $(eval $(foreach method,\
 	$(call gb_Library__forward_to_Linktarget,$(method))\
 ))
 
+ifeq ($(DISABLE_DYNLOADING),TRUE)
+
+define gb_Library_use_libraries
+endef
+
+define gb_Library_use_static_libraries
+endef
+
+else
+
+$(eval $(foreach method,\
+	use_libraries \
+	use_static_libraries \
+,\
+	$(call gb_Library__forward_to_Linktarget,$(method))\
+))
+
+endif
+
 # vim: set noet sw=4: