diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-03-23 11:32:36 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-03-25 16:38:25 +0100 |
| commit | 1911e5eac88984e5ae171594a1702c01fb138ddf (patch) | |
| tree | 0bbe33071ff7f77022d31f36d5b7bdb641bf693f /solenv | |
| parent | ee2f51cd43ef4e5fbda33918daee26e06ab38580 (diff) | |
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@hypra.fr>
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
(cherry picked from commit 190f81e34d918da289310a90416f9b6b7be7295f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90823
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 25142f70625c..d5dcb8e345c1 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -194,7 +194,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 3c41c945a559..143847fb66f4 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -644,7 +644,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 ) |