|
After
commit a4b4a90557f9fc1839fc0eb297f4c6a4e94c761a
Date: Sun Jul 2 14:54:23 2023 +0900
lxml: upgrade to release 4.9.2
, my `--enable-python=fully-internal` build started
to fail with
Building lxml version 4.9.2.
Building without Cython.
Building against libxml2 2.9.14 and libxslt 1.1.35
Traceback (most recent call last):
File "setup.py", line 207, in <module>
setup(
File ".../libreoffice/instdir/program/python-core-3.8.18/lib/distutils/core.py", line 108, in setup
_setup_distribution = dist = klass(attrs)
File ".../libreoffice/instdir/program/python-core-3.8.18/lib/distutils/dist.py", line 274, in __init__
warnings.warn(msg)
UserWarning: Unknown distribution option: 'project_urls'
make[1]: *** [.../libreoffice/external/lxml/ExternalProject_lxml.mk:26: .../libreoffice/workdir/ExternalProject/lxml/build] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:289: build] Error 2
and Julien reports the same in [1].
The above commit includes a patch to switch from
setuptools to distutils.
Possibly the distutils variant of the `setup` function
doesn't know about the "project_urls" keyword argument
(at least in our bundled Python version),
so extend the patch to drop that from the
`setup.py`.
[1] https://gerrit.libreoffice.org/c/core/+/153863
Change-Id: Icfac9fb0a3c62d3b30c12bc23ddbc0f9b088d788
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158230
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
