diff options
| -rw-r--r-- | Repository.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | lingucomponent/Library_MacOSXSpell.mk | 1 | ||||
| -rw-r--r-- | lingucomponent/Module_lingucomponent.mk | 4 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 6 | ||||
| -rwxr-xr-x | solenv/bin/native-code.py | 4 |
6 files changed, 16 insertions, 11 deletions
diff --git a/Repository.mk b/Repository.mk index d06f4d0dbc48..88b88d73808f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -385,7 +385,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ localebe1 \ log \ lng \ - lnth \ + $(if $(filter-out iOS,$(OS)),lnth) \ $(if $(filter $(OS),MACOSX),macbe1) \ $(if $(MERGELIBS),merged) \ migrationoo2 \ @@ -419,7 +419,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ simplecanvas \ slideshow \ sot \ - spell \ + $(if $(filter-out iOS,$(OS)),spell) \ $(if $(DISABLE_GUI),,spl) \ storagefd \ $(call gb_Helper_optional,SCRIPTING,stringresource) \ diff --git a/configure.ac b/configure.ac index 093027bcf524..bc2e5699315b 100644 --- a/configure.ac +++ b/configure.ac @@ -10172,7 +10172,9 @@ dnl =================================================================== dnl Check for system hunspell dnl =================================================================== AC_MSG_CHECKING([which libhunspell to use]) -if test "$with_system_hunspell" = "yes"; then +if test "$_os" = iOS; then + AC_MSG_RESULT([none]) +elif test "$with_system_hunspell" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_HUNSPELL=TRUE AC_LANG_PUSH([C++]) @@ -10271,7 +10273,9 @@ dnl =================================================================== dnl Checking for mythes dnl =================================================================== AC_MSG_CHECKING([which mythes to use]) -if test "$with_system_mythes" = "yes"; then +if test "$_os" = iOS; then + AC_MSG_RESULT([none]) +elif test "$with_system_mythes" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_MYTHES=TRUE AC_LANG_PUSH([C++]) diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk index f244673a1c4c..d49ee47a73bd 100644 --- a/lingucomponent/Library_MacOSXSpell.mk +++ b/lingucomponent/Library_MacOSXSpell.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,MacOSXSpell,\ $(eval $(call gb_Library_use_externals,MacOSXSpell,\ boost_headers \ - hunspell \ )) $(eval $(call gb_Library_add_objcxxobjects,MacOSXSpell,\ diff --git a/lingucomponent/Module_lingucomponent.mk b/lingucomponent/Module_lingucomponent.mk index 2bde5d5391e5..9dabeb155673 100644 --- a/lingucomponent/Module_lingucomponent.mk +++ b/lingucomponent/Module_lingucomponent.mk @@ -13,9 +13,9 @@ $(eval $(call gb_Module_Module,lingucomponent)) $(eval $(call gb_Module_add_targets,lingucomponent,\ Library_guesslang \ Library_hyphen \ - Library_lnth \ + $(if $(filter-out iOS,$(OS)),Library_lnth) \ $(if $(filter iOS MACOSX,$(OS)),Library_MacOSXSpell) \ - Library_spell \ + $(if $(filter-out iOS,$(OS)),Library_spell) \ StaticLibrary_ulingu \ Library_numbertext \ )) diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index c5f5fe31a63b..f9914bf5090b 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -50,8 +50,10 @@ $(eval $(call gb_Rdb_add_components,services,\ i18npool/util/i18npool \ lingucomponent/source/hyphenator/hyphen/hyphen \ lingucomponent/source/languageguessing/guesslang \ - lingucomponent/source/spellcheck/spell/spell \ - lingucomponent/source/thesaurus/libnth/lnth \ + $(if $(filter-out iOS,$(OS)), \ + lingucomponent/source/spellcheck/spell/spell \ + lingucomponent/source/thesaurus/libnth/lnth \ + ) \ lingucomponent/source/numbertext/numbertext \ linguistic/source/lng \ $(if $(ENABLE_LWP), \ diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 91c7df2d1403..344a08f195a4 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -33,7 +33,7 @@ core_factory_list = [ ("libi18nsearchlo.a", "i18nsearch_component_getFactory"), ("libinvocadaptlo.a", "invocadapt_component_getFactory"), ("liblnglo.a", "lng_component_getFactory"), - ("liblnthlo.a", "lnth_component_getFactory"), + ("liblnthlo.a", "lnth_component_getFactory", "#ifndef IOS"), ("liblocalebe1lo.a", "localebe1_component_getFactory"), ("libpackage2.a", "package2_component_getFactory"), ("libsmlo.a", "sm_component_getFactory"), @@ -57,7 +57,7 @@ core_factory_list = [ ("libxmlscriptlo.a", "xmlscript_component_getFactory"), ("libmcnttype.a", "mcnttype_component_getFactory"), ("libvcllo.a", "vcl_component_getFactory"), - ("libspelllo.a", "spell_component_getFactory"), + ("libspelllo.a", "spell_component_getFactory", "#ifndef IOS"), ("libpdffilterlo.a", "pdffilter_component_getFactory"), ("libsvgiolo.a", "svgio_component_getFactory"), ("libsvtlo.a", "svt_component_getFactory"), |