From patchwork Wed Apr 9 21:27:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 23156 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 7A92CC3213 for ; Wed, 9 Apr 2025 21:28:16 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 70CB76899E; Wed, 9 Apr 2025 23:28:15 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="NDLz3AUx"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 213AC627F4 for ; Wed, 9 Apr 2025 23:28:13 +0200 (CEST) Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 41AC882E; Wed, 9 Apr 2025 23:26:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1744233974; bh=q+/mO2ndVH75TbjpW/9nvV4JzVFMXX9lBT0msyOTCes=; h=From:To:Cc:Subject:Date:From; b=NDLz3AUx76Xw2riePTIqJBMUNGz+HngqlQpkFieq+Yb68p6kdT3uAMhHjeiJPez1G ALBUVs0yGsGHGfmg8F3SRwxV3a3+kKR19kDcJF/40NdZe2H9QvEMjo5qMmzWWyEezC eqRjFXt26B7gkkuB7PVWSYHH1FptuW9TqOFEOLZA= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Cc: Quentin Schulz , Quentin Schulz , =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= Subject: [PATCH v2] meson: Do not automatically build documentation if sphinx-build-3 is found Date: Thu, 10 Apr 2025 00:27:47 +0300 Message-ID: <20250409212747.29280-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 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 Signed-off-by: Laurent Pinchart Reviewed-by: Quentin Schulz Tested-by: Quentin Schulz Reviewed-by: Kieran Bingham --- Quentin, could you please test this version ? --- Documentation/meson.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) base-commit: 058f589ae36170935e537910f2c303b1c3ea03b3 -- Regards, Laurent Pinchart diff --git a/Documentation/meson.build b/Documentation/meson.build index 6158320e177c..0fc5909d088e 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 = [