Kaydet (Commit) 28e8c3e2 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

--without-lxml for Flatpak builds

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 1462b278 "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/51321Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst a9846592
......@@ -2082,6 +2082,13 @@ AC_ARG_WITH(iwyu,
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 Branding
dnl ===================================================================
......@@ -8157,35 +8164,37 @@ if test $enable_python = system; then
PYTHON_FOR_BUILD=$PYTHON
fi
if test -z "$PYTHON_FOR_BUILD"; then
case $build_os in
cygwin)
AC_MSG_WARN([No system-provided python lxml, gla11y will only report widget classes and ids])
;;
*)
if test "$cross_compiling" != yes ; then
BUILD_TYPE="$BUILD_TYPE LXML"
fi
;;
esac
else
AC_MSG_CHECKING([for python lxml])
if $PYTHON_FOR_BUILD -c "import lxml.etree as ET" 2> /dev/null ; then
AC_MSG_RESULT([yes])
else
if test "$with_lxml" != no; then
if test -z "$PYTHON_FOR_BUILD"; then
case $build_os in
cygwin)
AC_MSG_RESULT([no, gla11y will only report widget classes and ids])
AC_MSG_WARN([No system-provided python lxml, gla11y will only report widget classes and ids])
;;
*)
if test "$cross_compiling" != yes -a "x$ac_cv_header_Python_h" = "xyes"; then
if test "$cross_compiling" != yes ; then
BUILD_TYPE="$BUILD_TYPE LXML"
AC_MSG_RESULT([no, using internal lxml])
else
AC_MSG_RESULT([no, and system does not provide python development headers, gla11y will only report widget classes and ids])
fi
;;
esac
else
AC_MSG_CHECKING([for python lxml])
if $PYTHON_FOR_BUILD -c "import lxml.etree as ET" 2> /dev/null ; then
AC_MSG_RESULT([yes])
else
case $build_os in
cygwin)
AC_MSG_RESULT([no, gla11y will only report widget classes and ids])
;;
*)
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])
else
AC_MSG_RESULT([no, and system does not provide python development headers, gla11y will only report widget classes and ids])
fi
;;
esac
fi
fi
fi
......
......@@ -9,6 +9,7 @@
--with-vendor=The Document Foundation
--without-export-validation
--without-junit
--without-lxml
--without-system-apache-commons
--without-system-beanshell
--without-system-bluez
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment