From patchwork Fri Apr 4 16:12:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 23139 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 52459C3284 for ; Fri, 4 Apr 2025 16:12:59 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B5C67689AA; Fri, 4 Apr 2025 18:12:57 +0200 (CEST) Received: from smtp-1908.mail.infomaniak.ch (smtp-1908.mail.infomaniak.ch [185.125.25.8]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 49A296899E for ; Fri, 4 Apr 2025 18:12:56 +0200 (CEST) Received: from smtp-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4ZTkCr19N1zKVD; Fri, 4 Apr 2025 18:12:56 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4ZTkCq5M7dzYLM; Fri, 4 Apr 2025 18:12:55 +0200 (CEST) From: Quentin Schulz To: Cc: libcamera-devel@lists.libcamera.org, Quentin Schulz Subject: [PATCH 2/2] meson: do not automatically build documentation if sphinx-build-3 is found Date: Fri, 4 Apr 2025 18:12:35 +0200 Message-ID: <20250404161237.1298653-2-foss+libcamera@0leil.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250404161237.1298653-1-foss+libcamera@0leil.net> References: <20250404161237.1298653-1-foss+libcamera@0leil.net> MIME-Version: 1.0 X-Infomaniak-Routing: alpha X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Quentin Schulz 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 Reviewed-by: Laurent Pinchart --- Documentation/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/meson.build b/Documentation/meson.build index 6158320e..c59849f6 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -116,7 +116,7 @@ endif # Sphinx # -sphinx = find_program('sphinx-build-3', required : false) +sphinx = find_program('sphinx-build-3', required : get_option('documentation')) if not sphinx.found() sphinx = find_program('sphinx-build', required : get_option('documentation')) endif