RepositoryExternal.mk | 2 +- configure.ac | 9 ++++++++- helpcompiler/Module_helpcompiler.mk | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-)
New commits: commit ef47b4c2aa50b74d1f337f764428bfb1a537faa8 Author: Jan-Marek Glogowski <glo...@fbihome.de> AuthorDate: Tue Dec 21 14:12:10 2021 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Mar 9 12:31:43 2022 +0100 Don't build clucene if not needed Just build it if HELPTOOLS or XMLHELP are in BUILD_TYPE. And simply tets for clucene just in this case. And since XMLHELP is not in the list of PERMITTED_BUILD_TARGETS, disable it. Change-Id: I13fdbf096c60191a428e23c22344f7e22e8c5d66 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127231 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9044f574bc81..d86edc543e44 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2940,7 +2940,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ - clucene \ + $(call gb_Helper_optionals_or,HELPTOOLS XMLHELP,clucene) \ )) endif # SYSTEM_CLUCENE diff --git a/configure.ac b/configure.ac index 03e7fc52d688..a7d6267c73cc 100644 --- a/configure.ac +++ b/configure.ac @@ -813,6 +813,7 @@ disable_database_connectivity_dependencies() # =================================================================== build_crypto=yes test_cmis=yes +test_clucene=no test_gdb_index=no test_openldap=yes test_split_debug=no @@ -5413,6 +5414,7 @@ fi AC_MSG_CHECKING([if we need to build the help index tooling]) if test "$with_help" = yes -o "$enable_extension_integration" != no; then BUILD_TYPE="$BUILD_TYPE HELPTOOLS" + test_clucene=yes AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -5442,6 +5444,7 @@ fi AC_MSG_CHECKING([whether to include the XML-help support]) if test "$enable_xmlhelp" = yes; then BUILD_TYPE="$BUILD_TYPE XMLHELP" + test_clucene=yes AC_DEFINE(HAVE_FEATURE_XMLHELP) AC_MSG_RESULT([yes]) else @@ -5552,6 +5555,7 @@ if test "$cross_compiling" = "yes"; then --build="$build_alias" \ --disable-cairo-canvas \ --disable-cups \ + --disable-customtarget-components \ --disable-firebird-sdbc \ --disable-gpgmepp \ --disable-gstreamer-1-0 \ @@ -5564,6 +5568,7 @@ if test "$cross_compiling" = "yes"; then --disable-pdfimport \ --disable-postgresql-sdbc \ --disable-skia \ + --disable-xmlhelp \ --enable-icecream="$enable_icecream" \ --without-doxygen \ --without-webdav \ @@ -9324,8 +9329,8 @@ dnl =================================================================== dnl we should rather be using dnl libo_CHECK_SYSTEM_MODULE([clucence],[CLUCENE],[liblucence-core]) here dnl but the contribs-lib check seems tricky -if test "$enable_xmlhelp" = yes -o "$enable_extension_integration" = yes; then AC_MSG_CHECKING([which clucene to use]) +if test "$test_clucene" = yes; then if test "$with_system_clucene" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_CLUCENE=TRUE @@ -9352,6 +9357,8 @@ else SYSTEM_CLUCENE= BUILD_TYPE="$BUILD_TYPE CLUCENE" fi +else + AC_MSG_RESULT([not needed]) fi AC_SUBST(SYSTEM_CLUCENE) AC_SUBST(CLUCENE_CFLAGS) diff --git a/helpcompiler/Module_helpcompiler.mk b/helpcompiler/Module_helpcompiler.mk index 146e3868df3f..344faba3a1b8 100644 --- a/helpcompiler/Module_helpcompiler.mk +++ b/helpcompiler/Module_helpcompiler.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,helpcompiler)) $(eval $(call gb_Module_add_targets,helpcompiler,\ - Library_helplinker \ + $(call gb_Helper_optionals_or,HELPTOOLS XMLHELP,Library_helplinker) \ )) $(eval $(call gb_Module_add_targets_for_build,helpcompiler,\