123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051 |
- From ae2b6cb3cac6a38a6c96625915cea4b9cf3fc180 Mon Sep 17 00:00:00 2001
- From: Quentin Schulz <quentin.schulz@cherry.de>
- Date: Fri, 4 Apr 2025 18:12:35 +0200
- Subject: [PATCH] meson: Do not automatically build documentation if
- sphinx-build-3 is found
- Commit aba567338b25 ("Documentation: Move all dependencies into
- features") did an incomplete migration of the documentation boolean
- option into a documentation feature.
- If sphinx-build-3 binary is found on the host system, the documentation
- is built, regardless of the value of the feature option.
- This makes sure that sphinx-build-3 presence is only checked if the
- documentation feature is not disabled (which is the default, as it's
- "auto" by default).
- This is essential for reproducibility for build systems where
- sphinx-build-3 may or may not be present when libcamera is built, and
- also to declutter the generated package if documentation isn't desired.
- Fixes: aba567338b25 ("Documentation: Move all dependencies into features")
- Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
- Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
- Tested-by: Quentin Schulz <quentin.schulz@cherry.de>
- Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
- Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- Upstream: https://git.libcamera.org/libcamera/libcamera.git/commit/?id=ae2b6cb3cac6a38a6c96625915cea4b9cf3fc180
- Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
- ---
- Documentation/meson.build | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
- diff --git a/Documentation/meson.build b/Documentation/meson.build
- index 6158320e..0fc5909d 100644
- --- a/Documentation/meson.build
- +++ b/Documentation/meson.build
- @@ -116,10 +116,8 @@ endif
- # Sphinx
- #
-
- -sphinx = find_program('sphinx-build-3', required : false)
- -if not sphinx.found()
- - sphinx = find_program('sphinx-build', required : get_option('documentation'))
- -endif
- +sphinx = find_program('sphinx-build-3', 'sphinx-build',
- + required : get_option('documentation'))
-
- if sphinx.found()
- docs_sources = [
|