On Wed, 2024-06-26 at 21:17 +0200, PICCA Frederic-Emmanuel wrote: > I already push m’y change to the llvmlite repo > > You can use it and tell me if something is not working
I had problems building 0.43.0-1~exp1 as the sphinx documentation build tried to download the python3 and llvm-14-doc objects.inv files, and my build system was blocking network access. I did a quick patch that addes the matching debian doc packages as a nodoc build dependency and patches the sphinx conf.py file to use the local objects.inv file. It might be nice if the patch could look up the llvm doc package version in the d/control file so the patch didn't need to be adjust every new llvm version. I'm not sure I have access to the llvmlite repository, so patch attached. Diane
From 2f1fc8f92f806d9053b0dba86b76f1e1f1e28aaf Mon Sep 17 00:00:00 2001 From: Diane Trout <[email protected]> Date: Thu, 27 Jun 2024 10:56:11 -0700 Subject: [PATCH] Remove need for access to network while building documentation * Add use-local-objectsinv.patch to prevent network access * Add python3-doc and llvm-15-doc as nodoc build dependencies --- debian/changelog | 5 +++++ debian/control | 2 ++ debian/patches/series | 1 + debian/patches/use-local-objectsinv.patch | 15 +++++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 debian/patches/use-local-objectsinv.patch diff --git a/debian/changelog b/debian/changelog index 94a8d10..4b6c6b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ llvmlite (0.43.0-1~exp1) UNRELEASED; urgency=medium + [ Picca Frédéric-Emmanuel ] * New upstream version 0.43.0 + [ Diane Trout ] + * Add use-local-objectsinv.patch to prevent network access + * Add python3-doc and llvm-15-doc as nodoc build dependencies + -- Picca Frédéric-Emmanuel <[email protected]> Wed, 26 Jun 2024 08:03:12 +0200 llvmlite (0.42.0-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 90c6d34..6bd083a 100644 --- a/debian/control +++ b/debian/control @@ -6,10 +6,12 @@ Uploaders: Mo Zhou <[email protected]> Build-Depends: debhelper-compat (= 13), dh-python, + python3-doc <!nodoc>, python3:any | python3-all:any, python3-all-dev, python3-setuptools, llvm-15-dev, + llvm-15-doc <!nodoc>, Build-Depends-Indep: dh-sequence-sphinxdoc, python3-sphinx, diff --git a/debian/patches/series b/debian/patches/series index a01e3b6..01258c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ llvm-14-compat.patch recognize-default-buildflags.patch +use-local-objectsinv.patch diff --git a/debian/patches/use-local-objectsinv.patch b/debian/patches/use-local-objectsinv.patch new file mode 100644 index 0000000..6235055 --- /dev/null +++ b/debian/patches/use-local-objectsinv.patch @@ -0,0 +1,15 @@ +Author: Diane Trout <[email protected]> +Description: Point intersphinx to copies of the sphinx objects.inv + files built by debian for the referenced projects + +--- a/docs/source/conf.py ++++ b/docs/source/conf.py +@@ -301,6 +301,6 @@ + + # Example configuration for intersphinx: refer to the Python standard library. + intersphinx_mapping = { +- 'python': ('https://docs.python.org/3', None), +- 'llvm': ('http://llvm.org/releases/14.0.0/docs', None), ++ 'python': ('https://docs.python.org/3', '/usr/share/doc/python3-doc/html/objects.inv'), ++ 'llvm': ('http://llvm.org/releases/15.0.0/docs', '/usr/share/doc/llvm-15-doc/html/objects.inv'), + } -- 2.39.2
