mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

--without-lxml for Flatpak builds

Browse Source 
where the Yocto-based GNOME SDK provides no python lxml, but building LO's
internal one fails because it internally uses {xml2,xslt}-config, and those are
broken by (mis?-)design in Yocto, just returning with exit code 1.

It didn't work well to pass applications of pkg-config into the external/lxml
build as replacements for --with-{xml2,xslt}-config (as is successfully done
elsewhere with 1462b2784f "Adapt the
external/redland/raptor/xml2-config.patch to raptor2-2.0.15"), so just run
gla11y in its slightly limited form without lxml in the Flatpak build.

Change-Id: I2d42901373c8c861b16da385c37bcc24d6e783fd
Reviewed-on: https://gerrit.libreoffice.org/51321
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2018-03-15 09:56:32 +01:00
parent a98465920f
commit 28e8c3e28b
2 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@@ -2082,6 +2082,13 @@ AC_ARG_WITH(iwyu,
Use only if you are hacking on it.]), Use only if you are hacking on it.]),
,) ,)
libo_FUZZ_ARG_WITH(lxml,
AS_HELP_STRING([--without-lxml],
[gla11y will use python lxml when available, potentially building a local copy if necessary.
--without-lxml tells it to not use python lxml at all, which means that gla11y will only
report widget classes and ids.]),
,)
dnl =================================================================== dnl ===================================================================
dnl Branding dnl Branding
dnl =================================================================== dnl ===================================================================
@@ -8157,7 +8164,8 @@ if test $enable_python = system; then
PYTHON_FOR_BUILD=$PYTHON PYTHON_FOR_BUILD=$PYTHON
fi fi
if test -z "$PYTHON_FOR_BUILD"; then if test "$with_lxml" != no; then
if test -z "$PYTHON_FOR_BUILD"; then
case $build_os in case $build_os in
cygwin) cygwin)
AC_MSG_WARN([No system-provided python lxml, gla11y will only report widget classes and ids]) AC_MSG_WARN([No system-provided python lxml, gla11y will only report widget classes and ids])
@@ -8168,7 +8176,7 @@ if test -z "$PYTHON_FOR_BUILD"; then
fi fi
;; ;;
esac esac
else else
AC_MSG_CHECKING([for python lxml]) AC_MSG_CHECKING([for python lxml])
if $PYTHON_FOR_BUILD -c "import lxml.etree as ET" 2> /dev/null ; then if $PYTHON_FOR_BUILD -c "import lxml.etree as ET" 2> /dev/null ; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
@@ -8187,6 +8195,7 @@ else
;; ;;
esac esac
fi fi
fi
fi fi
dnl By now enable_python should be "system", "internal" or "no" dnl By now enable_python should be "system", "internal" or "no"

1
distro-configs/LibreOfficeFlatpak.conf
View File

@@ -9,6 +9,7 @@
--with-vendor=The Document Foundation --with-vendor=The Document Foundation
--without-export-validation --without-export-validation
--without-junit --without-junit
--without-lxml
--without-system-apache-commons --without-system-apache-commons
--without-system-beanshell --without-system-beanshell
--without-system-bluez --without-system-bluez