[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - configure.ac solenv/gbuild

[Michael Stahl (via logerrit)]

 configure.ac                            |    8 ++++++--
 solenv/gbuild/platform/com_GCC_class.mk |    2 +-
 solenv/gbuild/platform/com_MSC_class.mk |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 98b832341b90bffc7d664eb00eb29672096eacc0
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Mon Mar 23 11:32:36 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Mar 27 11:58:23 2020 +0100

    configure,gbuild: gla11y fails on Fedora 31
    
    The problem is that the LD_LIBRARY_PATH on the command line causes
    /usr/bin/python to find LO's libpython*.so*:
    
         18269:     find library=libpython3.7m.so.1.0 [0]; searching
         18269:      search path=.../instdir/program                (LD_LIBRARY_PATH)
         18269:       trying file=.../instdir/program/libpython3.7m.so.1.0
    
    Presumably LD_LIBRARY_PATH is used to find bundled libxml/libxslt.
    
    So let's try to disable the broken case where a bundled lxml is used
    with system python and bundled libxml/libxslt; this cannot work.
    
    (regression from 84ef6d82546b044990f4efd57e51e29c6c6565c8)
    
    Change-Id: I67aa8250691cae8f899d65f674aa9da23a9d1d7a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90906
    Reviewed-by: Samuel Thibault <sthibault at hypra.fr>
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Tested-by: Jenkins
    (cherry picked from commit 190f81e34d918da289310a90416f9b6b7be7295f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90823
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 1911e5eac88984e5ae171594a1702c01fb138ddf)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91168
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/configure.ac b/configure.ac
index 32b4041a29f1..9029cd036c88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8678,8 +8678,12 @@ if test "$with_lxml" != no; then
                     ;;
                 *)
                     if test "$cross_compiling" != yes -a "x$ac_cv_header_Python_h" = "xyes"; then
-                        BUILD_TYPE="$BUILD_TYPE LXML"
-                        AC_MSG_RESULT([no, using internal lxml])
+                        if test -n ${SYSTEM_LIBXSLT} -o -n ${SYSTEM_LIBXML}; then
+                            AC_MSG_RESULT([no, and no system libxml/libxslt, gla11y will only report widget classes and ids])
+                        else
+                            BUILD_TYPE="$BUILD_TYPE LXML"
+                            AC_MSG_RESULT([no, using internal lxml])
+                        fi
                     else
                         AC_MSG_RESULT([no, and system does not provide python development headers, gla11y will only report widget classes and ids])
                     fi
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 5ae811ad81c7..ee453ed328a5 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -187,7 +187,7 @@ endef
 
 define gb_UIConfig__gla11y_command
 $(call gb_Helper_abbreviate_dirs,\
-	$(gb_UIConfig_LXML_PATH) $(gb_Helper_set_ld_path) \
+	$(gb_UIConfig_LXML_PATH) $(if $(SYSTEM_LIBXML)$(SYSTEM_LIBXSLT),,$(gb_Helper_set_ld_path)) \
 	$(call gb_ExternalExecutable_get_command,python) \
 	$(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ $(UIFILES)
 )
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 02f7f44d5143..5b4a5ed53a6d 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -594,7 +594,7 @@ define gb_UIConfig__gla11y_command
 $(call gb_ExternalExecutale__check_registration,python)
 $(call gb_Helper_abbreviate_dirs,\
 	FILES=$(call var2file,$(shell $(gb_MKTEMP)),100,$(UIFILES)) && \
-	$(gb_UIConfig_LXML_PATH) $(gb_Helper_set_ld_path) \
+	$(gb_UIConfig_LXML_PATH) $(if $(SYSTEM_LIBXML)$(SYSTEM_LIBXSLT),,$(gb_Helper_set_ld_path)) \
 	$(call gb_ExternalExecutable_get_command,python) \
 	$(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ -L $$FILES
 )