some patches against build-script

[PATCH 3/3] docs: Makefile: use PYTHONPYCACHEPREFIX

Posted by Mauro Carvalho Chehab 2 days, 13 hours ago

Previous cleanup patches ended dropping it when sphinx-build-wrapper
were added. Also, sphinx-pre-install can also generate caches.

So, re-add it for both.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
 Documentation/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index f764604fa1ac..cf26d5332fb5 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -60,8 +60,10 @@ else # HAVE_SPHINX
 
 # Common documentation targets
 htmldocs mandocs infodocs texinfodocs latexdocs epubdocs xmldocs pdfdocs linkcheckdocs:
-	$(Q)@$(srctree)/tools/docs/sphinx-pre-install --version-check
-	+$(Q)$(PYTHON3) $(BUILD_WRAPPER) $@ \
+	$(Q)PYTHONPYCACHEPREFIX="$(PYTHONPYCACHEPREFIX)" \
+		@$(srctree)/tools/docs/sphinx-pre-install --version-check
+	+$(Q)PYTHONPYCACHEPREFIX="$(PYTHONPYCACHEPREFIX)" \
+		$(PYTHON3) $(BUILD_WRAPPER) $@ \
 		--sphinxdirs="$(SPHINXDIRS)" $(RUSTDOC) \
 		--builddir="$(BUILDDIR)" --deny-vf=$(FONTS_CONF_DENY_VF) \
 		--theme=$(DOCS_THEME) --css=$(DOCS_CSS) --paper=$(PAPER)
-- 
2.51.0

Re: [PATCH 3/3] docs: Makefile: use PYTHONPYCACHEPREFIX

Posted by Jonathan Corbet 9 hours ago

Mauro Carvalho Chehab <mchehab+huawei@kernel.org> writes:

> Previous cleanup patches ended dropping it when sphinx-build-wrapper
> were added. Also, sphinx-pre-install can also generate caches.
>
> So, re-add it for both.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
> ---
>  Documentation/Makefile | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index f764604fa1ac..cf26d5332fb5 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -60,8 +60,10 @@ else # HAVE_SPHINX
>  
>  # Common documentation targets
>  htmldocs mandocs infodocs texinfodocs latexdocs epubdocs xmldocs pdfdocs linkcheckdocs:
> -	$(Q)@$(srctree)/tools/docs/sphinx-pre-install --version-check
> -	+$(Q)$(PYTHON3) $(BUILD_WRAPPER) $@ \
> +	$(Q)PYTHONPYCACHEPREFIX="$(PYTHONPYCACHEPREFIX)" \
> +		@$(srctree)/tools/docs/sphinx-pre-install --version-check
> +	+$(Q)PYTHONPYCACHEPREFIX="$(PYTHONPYCACHEPREFIX)" \
> +		$(PYTHON3) $(BUILD_WRAPPER) $@ \

This causes an immediate build fail for me:

  /bin/sh: line 1: @./tools/docs/sphinx-pre-install: No such file or directory
  make[2]: *** [Documentation/Makefile:63: htmldocs] Error 127
  make[1]: *** [Makefile:1808: htmldocs] Error 2
  make: *** [Makefile:248: __sub-make] Error 2

jon

Re: [PATCH 3/3] docs: Makefile: use PYTHONPYCACHEPREFIX

Posted by Mauro Carvalho Chehab 8 hours ago

On Wed, Oct 01, 2025 at 06:55:57AM -0600, Jonathan Corbet wrote:
> Mauro Carvalho Chehab <mchehab+huawei@kernel.org> writes:
> 
> > Previous cleanup patches ended dropping it when sphinx-build-wrapper
> > were added. Also, sphinx-pre-install can also generate caches.
> >
> > So, re-add it for both.
> >
> > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
> > ---
> >  Documentation/Makefile | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/Documentation/Makefile b/Documentation/Makefile
> > index f764604fa1ac..cf26d5332fb5 100644
> > --- a/Documentation/Makefile
> > +++ b/Documentation/Makefile
> > @@ -60,8 +60,10 @@ else # HAVE_SPHINX
> >  
> >  # Common documentation targets
> >  htmldocs mandocs infodocs texinfodocs latexdocs epubdocs xmldocs pdfdocs linkcheckdocs:
> > -	$(Q)@$(srctree)/tools/docs/sphinx-pre-install --version-check
> > -	+$(Q)$(PYTHON3) $(BUILD_WRAPPER) $@ \
> > +	$(Q)PYTHONPYCACHEPREFIX="$(PYTHONPYCACHEPREFIX)" \
> > +		@$(srctree)/tools/docs/sphinx-pre-install --version-check

The problem is the "@" here...

> > +	+$(Q)PYTHONPYCACHEPREFIX="$(PYTHONPYCACHEPREFIX)" \
> > +		$(PYTHON3) $(BUILD_WRAPPER) $@ \
> 
> This causes an immediate build fail for me:
> 
>   /bin/sh: line 1: @./tools/docs/sphinx-pre-install: No such file or directory
>   make[2]: *** [Documentation/Makefile:63: htmldocs] Error 127
>   make[1]: *** [Makefile:1808: htmldocs] Error 2
>   make: *** [Makefile:248: __sub-make] Error 2

Fixed and will resend you a new version. This /3 series, plus a RFC
for kernel-doc are the only one pending.

I'll send the RFC in separate, and send a new version of this one.

> 
> jon

-- 
Thanks,
Mauro