From patchwork Fri Mar 28 08:38:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14031758 Received: from fhigh-b2-smtp.messagingengine.com (fhigh-b2-smtp.messagingengine.com [202.12.124.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CAE8212FA1 for ; Fri, 28 Mar 2025 08:38:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743151129; cv=none; b=WjPSmsIaofvDb9V+Nn7zlED6alD9hRBPDcjoP5aKEXJEdF6CZCt/ScURAVPSL05Bpqapil+8uIzBHpEsMUa3ilcQ65KOp/cfoP87yItSldy3HRFJOob7jl4Vy2c4/3GkCDO869vhuHEmNk2ryH/+cgfab0A9yVWgBZsZrHzi+cM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743151129; c=relaxed/simple; bh=chVaoPlyut2l4weiZmt36VrLKkqYxppb8dZwWMJHKlg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dIbCxhkOqyV8xKXU1+WtHciGHIljlmderOHjjvrBZBH4RvH7DJeouoQzPKUbzSoeGB+IXSqszEQ8yeFomv35jzNWrtPUKwLyyHz5hb1fmPWKyveO4WoErFZgDZ+0t+InNkkr7KAwwmgbFqzlbdXp9Z/Lu9KFgmhWesQMNoxB/EE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=Pv0PY7fY; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=pMfYns/i; arc=none smtp.client-ip=202.12.124.153 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="Pv0PY7fY"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="pMfYns/i" Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfhigh.stl.internal (Postfix) with ESMTP id 4A9D025401B4; Fri, 28 Mar 2025 04:38:46 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Fri, 28 Mar 2025 04:38:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1743151126; x=1743237526; bh=y+0SGKZlU5DD6aS2R3PLleGueA9fWlSiu2TPsSqL39o=; b= Pv0PY7fYsFGluCMAXYWox5cKzyriSfgqgasbzTV1eFye8IZfZrVkl68P2nkm5pzl GLW7J2dEVwEk9o4Gx8ljiLSagrl6c4cn1OBPjnMWLjm+v/coe4lYfLmTErE2djP8 UtXNLKpl8Bpums3smU17a12DN2/SA3Usg59cOR5hnmr467/PL72yzKahrLpHsWrx bg8atyXgi4xSHFxXl7oRLk+JAvcLvquLAcDdazZrqQiTVlReU6z7TWfLjyhPIrVs p/LrsYuVvHxvRoTv7o4C9nP+PSJt67AwmpOvBNwMLCNY9xPjRI+lb9rzosNjxGbs 2vUH2JWafTc1LBcq32UgGQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1743151126; x= 1743237526; bh=y+0SGKZlU5DD6aS2R3PLleGueA9fWlSiu2TPsSqL39o=; b=p MfYns/iBnZYfX7y7SX0NFVpRY0bO4TJBExufMGpZdOXioCmXCHRXAIQlCFv87Sfj Y3vxLEO7ToarfVvjN0SRm2dN++r+ceGUqqkn01za1IPdkMAy9g/BUgA4drtJNCC3 g43G5wJLQ4VrNXb2OQev7vowyXuf1KTKQdHGlx7NXONUVpwxuPnLroQKcnnBJ7kc F6CmpFGgYW11oCHleXuuBHYD0RHR86dBe33aZNtJHSkJCIwYB1x6Y9++SYwRXP5S ddt2ttAYfB9Xm+lUYjCgB7t95oAuG8+ZtzWZbVMc5Rb6x7zYR5KWAn7BE/rsAVK/ Ew+yNCsAsd+n15a1sFP1w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujedtkeefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertder tdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhksh drihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteek udehjeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeeipdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorh hgpdhrtghpthhtohepjhhohhgrnhhnvghsrdhstghhihhnuggvlhhinhesghhmgidruggv pdhrtghpthhtohepshgrmhesghgvnhhtohhordhorhhgpdhrtghpthhtohepthhgseguvg gsihgrnhdrohhrghdprhgtphhtthhopegvshgthhifrghrthiisehgvghnthhoohdrohhr ghdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhm X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 28 Mar 2025 04:38:44 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 1a03cf8d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 28 Mar 2025 08:38:41 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 28 Mar 2025 09:38:35 +0100 Subject: [PATCH 1/4] meson: fix handling of '-Dcurl=auto' Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250328-b4-pks-collect-build-fixes-v1-1-ead9deda3fbc@pks.im> References: <20250328-b4-pks-collect-build-fixes-v1-0-ead9deda3fbc@pks.im> In-Reply-To: <20250328-b4-pks-collect-build-fixes-v1-0-ead9deda3fbc@pks.im> To: git@vger.kernel.org Cc: Junio C Hamano , Sam James , Eli Schwartz , Thorsten Glaser , Johannes Schindelin X-Mailer: b4 0.14.2 The "curl" option controls whether or not a couple of features that depend on curl shall be included. Most importantly, these features include the HTTP remote helpers, which are rather quintessential for a well-functioning Git installation. So while the dependency can in theory be dropped, most users wouldn't consider the resulting installation to be fully functional. The "curl" option is defined as a feature, which means that it can be "enabled", "disabled" or "auto", which has the effect that the feature will be enabled if the dependency itself has been found. While most of the other features have "auto" as default value, the "curl" option is set to "enabled" by default due to it being so important. Consequently, autoconfiguration of Git will fail by default if the library cannot be found. There is a bug though with how we handle the option in case the user overrides the feature with `meson setup -Dcurl=auto`: while we will try to find the library in that case, we won't ever use it because we later on check for `get_option('curl').enabled()` when deciding whether or not we want to build dependent sources. But `enabled()` only returns true if the option has the value "enabled", for "auto" it will return false. Fix the issue by instead checking for `curl.found()`, which is only true if the library has been found. And as we only try to find the library when `get_option('curl')` returns "true" or "auto" this is exactly what we want. Signed-off-by: Patrick Steinhardt --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index efe2871c9db..a8d1e63ccc6 100644 --- a/meson.build +++ b/meson.build @@ -1686,7 +1686,7 @@ bin_wrappers += executable('scalar', install_dir: get_option('libexecdir') / 'git-core', ) -if get_option('curl').enabled() +if curl.found() libgit_curl = declare_dependency( sources: [ 'http.c', From patchwork Fri Mar 28 08:38:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14031759 Received: from fout-b2-smtp.messagingengine.com (fout-b2-smtp.messagingengine.com [202.12.124.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91DFC212B39 for ; Fri, 28 Mar 2025 08:38:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743151129; cv=none; b=rOJo40upsSVJQpn1mazzF26SL7qwBzFeM9iTH7uHa3xoWQ4tYww4B9281NB/k5HHDj2UPkBXWr3S6XAX2GFQqsOP63ChvpHBba7abfkjF3cX0mfIT65bEyZpUZhplD5iS6WwbvctlmDZncFMS0TtvgPQVdSiT6fIqPFHB3uB+bg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743151129; c=relaxed/simple; bh=TrNgkcaVzWXmV+Tuzsf7QZ4NDMp0OOVwxFDaTsY43jM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TYhQ0inTEM27Hc/sMbivRhJzmRyC5n06n3ckERmlGYq/qRr+SLwXF03FwYRzeX6BspwIO0GBRbK3shhjSWF4yGR+7vBRjRrBQdDl7PzUDdkmeSiuMhPSBpuFWMZzKMV0W+V3D3UmM8at+YRPGpR7oCp2ZWbQR5i4GLtRqnjhV3g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=WjUXSL/C; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=XxMcxOJS; arc=none smtp.client-ip=202.12.124.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="WjUXSL/C"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="XxMcxOJS" Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfout.stl.internal (Postfix) with ESMTP id 6259011401E1; Fri, 28 Mar 2025 04:38:46 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-09.internal (MEProxy); Fri, 28 Mar 2025 04:38:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1743151126; x=1743237526; bh=vELvFE236sl50D7Yt1DH2r3BaibQjQc5w+x1Q5MACYo=; b= WjUXSL/CfysDpNq20L348jKtiYlB2BMvRT4cRlGcxfAuNwbGbo7GkxQB5BAb8jbx 3Kq4dEueajBaM5FckYTWISvYXhRsNiSjZDtZ84d/jx/gX42Mgq4iU0wQZnuNEJV+ orN/wUEjht1nb89LOk+JgAwbFsWIXnsc+wV3hnakXBK0bFwdJ96x9vLKcCRrIBD3 wFjFuVquQTB7HvydbavlDmo7OY2+Ds7sbSPhZtLyCn4YiMq56uz1mMyibp2a/Kme Kogo0UE64SrYvHSKGRTO2o6+Ycx3e1A5+B2I87BnVmpc5Um1tO1hA5R/tXhceEXT 6dHjJB1zdbtk0FzNtOHVpQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1743151126; x= 1743237526; bh=vELvFE236sl50D7Yt1DH2r3BaibQjQc5w+x1Q5MACYo=; b=X xMcxOJSacmqu6GsVAzntOgYyb9zIR8xEG14hEtbnlYeTsuOul7pS2cX8KxDA31En 0D19qSn/AO8ZeHsXbjwV663R+UKZIv4ByUD/9BOA2f8aH6uDMHO1IRq3pJUAq8nr x4+l1Z5Jcvfyq/v/ST/gjd9P6YRa9w2ngI+oRnougmkWJSd4WHgHq1wYMXrWv5Ia IGqPshBPU/BvoPSmfsJ0d6UZgd9aG0Uacr6pc6UCTSvdQceSTjXIA2qfL0WJMjEX 9HzPDDCaWIPNlglsxX9EppIY+oasnj9XZ9/5ZMmpOUaMrcPbFQRrK2TWn9Qjjepu 3IGWST16tg8Ro6ZLTNXrQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujedtkeefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertder tdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhksh drihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteek udehjeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeeipdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorh hgpdhrtghpthhtohepshgrmhesghgvnhhtohhordhorhhgpdhrtghpthhtohepjhhohhgr nhhnvghsrdhstghhihhnuggvlhhinhesghhmgidruggvpdhrtghpthhtohepghhithhsth gvrhesphhosghogidrtghomhdprhgtphhtthhopehtghesuggvsghirghnrdhorhhgpdhr tghpthhtohepvghstghhfigrrhhtiiesghgvnhhtohhordhorhhg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 28 Mar 2025 04:38:44 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 33cc001a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 28 Mar 2025 08:38:42 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 28 Mar 2025 09:38:36 +0100 Subject: [PATCH 2/4] gitweb: fix generation of "gitweb.js" Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250328-b4-pks-collect-build-fixes-v1-2-ead9deda3fbc@pks.im> References: <20250328-b4-pks-collect-build-fixes-v1-0-ead9deda3fbc@pks.im> In-Reply-To: <20250328-b4-pks-collect-build-fixes-v1-0-ead9deda3fbc@pks.im> To: git@vger.kernel.org Cc: Junio C Hamano , Sam James , Eli Schwartz , Thorsten Glaser , Johannes Schindelin X-Mailer: b4 0.14.2 In 19d8fe7da65 (Makefile: extract script to generate gitweb.js, 2024-12-06) we have extracted the logic to build "gitweb.js" into a separate script. As part of that the rules that builds the script has gained a new dependency on that script. This refactoring is broken though because we use "$^" to determine the set of JavaScript files that need to be concatenated, and this implicit variable now also contains the build script itself. As a result, the build script ends up ni the generated "gitweb.js" file, which is wrong. Fix the issue by filtering out non-JavaScript files. Based-on-patch-by: Thorsten Glaser Signed-off-by: Patrick Steinhardt --- gitweb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb/Makefile b/gitweb/Makefile index d5748e93594..26a683d4421 100644 --- a/gitweb/Makefile +++ b/gitweb/Makefile @@ -118,7 +118,7 @@ $(MAK_DIR_GITWEB)gitweb.cgi: $(MAK_DIR_GITWEB)gitweb.perl $(MAK_DIR_GITWEB)static/gitweb.js: $(MAK_DIR_GITWEB)generate-gitweb-js.sh $(MAK_DIR_GITWEB)static/gitweb.js: $(addprefix $(MAK_DIR_GITWEB),$(GITWEB_JSLIB_FILES)) $(QUIET_GEN)$(RM) $@ $@+ && \ - $(MAK_DIR_GITWEB)generate-gitweb-js.sh $@+ $^ && \ + $(MAK_DIR_GITWEB)generate-gitweb-js.sh $@+ $(filter %.js,$^) && \ mv $@+ $@ ### Installation rules From patchwork Fri Mar 28 08:38:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14031760 Received: from fout-b2-smtp.messagingengine.com (fout-b2-smtp.messagingengine.com [202.12.124.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1ACBA21322F for ; Fri, 28 Mar 2025 08:38:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743151130; cv=none; b=PN5r5WBrQCSTLYQcBxJg4oWLMVdwh2yIYSxJqyUT8cjsHGxPexNkYZyavU6USmOwwdQ9NirEan/9G5+AHJuxrX4CuaevfCPsbgS9kGJVzVw+ru6LT3XPLiIqYVKkf9d+Z4r6DE2MJn5azVM7DIfHe7sXxzFdGIAvztjiGBC0kvQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743151130; c=relaxed/simple; bh=bfOZTh7jCaIdYI8MGCABuaLB8+tYSK/ytjoNn36xUBI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IuEtw5ikZngIv4RrwU6q8VuCjaoPwdgPk7JWlbLUVujYAMCTBp9PFBsIoWo1yD0wQeYRXOX7RptJqBNxWOPgAmu1y/ui9KNoOmDfBVWYbmqomu41mifnUT8mf3IkA3cg24+VEHsdPJeV8m6TUEzTtrC0OVAh6By4lZkg9yV8ws4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=HPO+AnTy; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=aY4cGVVh; arc=none smtp.client-ip=202.12.124.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="HPO+AnTy"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="aY4cGVVh" Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfout.stl.internal (Postfix) with ESMTP id 0D7CB11401CC; Fri, 28 Mar 2025 04:38:48 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Fri, 28 Mar 2025 04:38:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1743151127; x=1743237527; bh=xKxOiIL8rHL8pdtpMBUi5TudStErhBpiB4PZluHrRxo=; b= HPO+AnTyWiJDjlcw78KXtlsgfXIMM4Dh1zpRNUBVjyyUqY6lrv4ZJ5LvEih4Ou5l sNHk9P3N/D0FpMD26Fstu86HuMpHFrJdXUrxQ0henMOZFFCrVtLSKwgBjuBvDYbY YBZxjgNxakeS9NpXK76yses7WRPPcQgFSLud6HggIekD3mlwYMT25Ruyqtn7klhm wE3jYKsaB2j2QTLisvS6+QMrYWEBpnJx1z0ytbKMj5WlUWxvPVi+rgHjAqzmBTEZ 6cfi8gBXdF2uDKEMxqnC4hRM624E6TxFLmAp6FrDS80A8QER+U6Js/KiCb8qCTDl LY0vuVwoX/5Qn5MJp9T3gQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1743151127; x= 1743237527; bh=xKxOiIL8rHL8pdtpMBUi5TudStErhBpiB4PZluHrRxo=; b=a Y4cGVVhbwDoFQWDftK56Z/iDR9GQSegNANbNJHwFf0kRWSkn5d/H2JCGbDywZY5X MgLv3QR5bsM+OQD0btqaOdzEHhMCg8bFGx1e40RlXWWDQJCzWKFheWNWigK/l8WY p+oAd0rhX7ZhdLhJ6FvPY9Bh9B4SHv9GqWvOvREnnooa2MTmXRMS/bZjYMqpS/Qb r74czLOl+GgtO9kqeViLcWWGbYOR/tQsHoSG6oWDRVIIuDHLHEj7XKgMZUlH7+na 53949DRUzgetAIUA6Guh1UX5H8fBDF6eSWr7cSMS389WAaF/MYNxEtYAtsCDHZns eOPFm36o7cnAjqxcXlpGQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujedtkeefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertder tdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhksh drihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteek udehjeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeeipdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpd hrtghpthhtohepthhgseguvggsihgrnhdrohhrghdprhgtphhtthhopegvshgthhifrghr thiisehgvghnthhoohdrohhrghdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvg hlrdhorhhgpdhrtghpthhtohepjhhohhgrnhhnvghsrdhstghhihhnuggvlhhinhesghhm gidruggvpdhrtghpthhtohepshgrmhesghgvnhhtohhordhorhhg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 28 Mar 2025 04:38:46 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 0b3b6ec5 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 28 Mar 2025 08:38:43 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 28 Mar 2025 09:38:37 +0100 Subject: [PATCH 3/4] meson: require Perl when building docs Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250328-b4-pks-collect-build-fixes-v1-3-ead9deda3fbc@pks.im> References: <20250328-b4-pks-collect-build-fixes-v1-0-ead9deda3fbc@pks.im> In-Reply-To: <20250328-b4-pks-collect-build-fixes-v1-0-ead9deda3fbc@pks.im> To: git@vger.kernel.org Cc: Junio C Hamano , Sam James , Eli Schwartz , Thorsten Glaser , Johannes Schindelin X-Mailer: b4 0.14.2 From: Eli Schwartz When building our documentation we require Perl to generate the list of commands via "cmd-list.perl". Having a Perl interpreter available is thus mandatory when building documentation, but Meson does not enforce this prerequisite. Thus, when all optional features that depend on Perl are disabled, we won't look up the Perl interpreter, which will in the end lead to an error at setup time: ``` $ meson setup builddir/ -Ddocs=man -Dperl=disabled -Dtests=false [...] Documentation/meson.build:308:22: ERROR: Tried to use not-found external program in "command" ``` There is already a list of other cases where we do need the Perl interpreter. Building documentation should be one of those cases, but is missing from the list. Add it to fix the issue. Signed-off-by: Eli Schwartz Commit-message-edited-by: Patrick Steinhardt Signed-off-by: Patrick Steinhardt --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index a8d1e63ccc6..51013c70de9 100644 --- a/meson.build +++ b/meson.build @@ -772,7 +772,7 @@ endif # features. It is optional if you want to neither execute tests nor use any of # these optional features. perl_required = get_option('perl') -if get_option('tests') or get_option('gitweb').enabled() or 'netrc' in get_option('credential_helpers') +if get_option('tests') or get_option('gitweb').enabled() or 'netrc' in get_option('credential_helpers') or get_options('docs') != [] perl_required = true endif From patchwork Fri Mar 28 08:38:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14031761 Received: from fout-b2-smtp.messagingengine.com (fout-b2-smtp.messagingengine.com [202.12.124.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AD1A213232 for ; Fri, 28 Mar 2025 08:38:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743151131; cv=none; b=henLVMUygV0DpsTJ/9OlbkGBY3IQaWbIzjkjk/YNN5YaPiA8fSRe2aHEI5Avk0RpPkjY0AS3PIdoYFeo31xKo6baL8cgSDuoJDP5qSPEnn9p9GsLTi+EHAazdQInOXNR0pmfmTqytaZRFS3FIB/3IPTDMW4hONEqKrs32ryw/OE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743151131; c=relaxed/simple; bh=6Mx+OttVO70q9Y/RI1f4AfNkMwBQDdfwGjWvKjpIxyw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aR+xfZM+HtFNB+UkKOKOXe0y9VGFro9xnpIEoE/2mlsHYJTn3hQ24t5RLTgwUhpUGpOVcwqcn+kU1FwDKq78oE6WvobweOyR4ngXyk5My0R4ZowywdvjppQY9kHtjq66GOsnRlytuU40gBFFB3chteytXrm5F7YwmOkzgll6lUk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=PnbXTTzy; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=h9Gco9Dk; arc=none smtp.client-ip=202.12.124.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="PnbXTTzy"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="h9Gco9Dk" Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfout.stl.internal (Postfix) with ESMTP id 28D1711401DD; Fri, 28 Mar 2025 04:38:48 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Fri, 28 Mar 2025 04:38:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1743151128; x=1743237528; bh=uz50QcfITAuFXSvNI9OeJomYH5hJuU+E7Qw6yE/z39w=; b= PnbXTTzyW4DnsqLUQaadgtYv46c2e0PL3pcGrG2jFhcvBi/2S2Zzz+Lrp9qCgk9n E3GFq2jYBsJuCjYrv3MbkvffVLeEVjl7ijY1roVk37+dX+H9KdARmEN2sBgsO4XL ZyY/+F48NhQ6FjELZP59MiLbkIk7AzDBD8+cYXY4OXvliJo7C9FPHCD3lo4cPI1l +i7LT88Y9gyhgU6wMZsqXFNH8nlHrT5sWG7D85/jP8CENdU269MS+zzNSWzViHEY ZNIgS3zYSsFZYLdBasQQO+NVsw+nwEmji2AN0me7KGuZU1KoqRdgDlPB0BkSMEuu IXboLXrYkhulGSNTz/9jAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1743151128; x= 1743237528; bh=uz50QcfITAuFXSvNI9OeJomYH5hJuU+E7Qw6yE/z39w=; b=h 9Gco9DkaxVBQ2Ju9EPQC8g0/02QvoCzs89u6T69mnCB9iIPMGxtQJ11AlUA61TeE YOSDRqLE+BaqNeJpBWg+/rK7I5qoyk/zqFJlr7SaFKKPRdRptHvGQRmE4GSol+g0 eZvDNoyreZW5ZTw0LgGI4FqW1IjmjJT8FgEXdMGPUlTP2Tu1UXrBWBC/kQPwJEm1 nxPDj6DBLSPdEMKD2HQQDKKg+Us0qDVjJj93MkTGf18VJ+SlouNXu7p04via5IiE ectGgR+57JNJz9xPtwu9LHCjeZMOcojiKSh8NipQ+QC/fWFORRmKOLDvKyJfcT5P cRAEXd8pFB/uR//EGHHlw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujedtkeefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertder tdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhksh drihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteek udehjeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeeipdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpd hrtghpthhtohepghhithesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehs rghmsehgvghnthhoohdrohhrghdprhgtphhtthhopegvshgthhifrghrthiisehgvghnth hoohdrohhrghdprhgtphhtthhopehtghesuggvsghirghnrdhorhhgpdhrtghpthhtohep jhhohhgrnhhnvghsrdhstghhihhnuggvlhhinhesghhmgidruggv X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 28 Mar 2025 04:38:46 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 62b7f8f2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 28 Mar 2025 08:38:44 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 28 Mar 2025 09:38:38 +0100 Subject: [PATCH 4/4] meson: respect 'tests' build option in contrib Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250328-b4-pks-collect-build-fixes-v1-4-ead9deda3fbc@pks.im> References: <20250328-b4-pks-collect-build-fixes-v1-0-ead9deda3fbc@pks.im> In-Reply-To: <20250328-b4-pks-collect-build-fixes-v1-0-ead9deda3fbc@pks.im> To: git@vger.kernel.org Cc: Junio C Hamano , Sam James , Eli Schwartz , Thorsten Glaser , Johannes Schindelin X-Mailer: b4 0.14.2 Both the "netrc" credential helper and git-subtree(1) from "contrib/" carry a couple of tests with them. These tests get wired up in Meson unconditionally even in the case where `-Dtests=false`. As those tests depend on the `test_enviroment` variable, which only gets defined in case `-Dtests=true`, the result is an error: ``` $ meson setup -Dtests=false -Dcontrib=subtree build [...] contrib/subtree/meson.build:15:27: ERROR: Unknown variable "test_environment". ``` Fix the issue by not defining these tests at all in case the "tests" option is set to `false`. Reported-by: Sam James Signed-off-by: Patrick Steinhardt --- contrib/credential/netrc/meson.build | 22 ++++++++++++---------- contrib/subtree/meson.build | 20 +++++++++++--------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/contrib/credential/netrc/meson.build b/contrib/credential/netrc/meson.build index a990dbb86da..3d74547c8ae 100644 --- a/contrib/credential/netrc/meson.build +++ b/contrib/credential/netrc/meson.build @@ -7,14 +7,16 @@ credential_netrc = custom_target( install_dir: get_option('libexecdir') / 'git-core', ) -credential_netrc_testenv = test_environment -credential_netrc_testenv.set('CREDENTIAL_NETRC_PATH', credential_netrc.full_path()) +if get_option('tests') + credential_netrc_testenv = test_environment + credential_netrc_testenv.set('CREDENTIAL_NETRC_PATH', credential_netrc.full_path()) -test('t-git-credential-netrc', - shell, - args: [ meson.current_source_dir() / 't-git-credential-netrc.sh' ], - workdir: meson.current_source_dir(), - env: credential_netrc_testenv, - depends: test_dependencies + bin_wrappers + [credential_netrc], - timeout: 0, -) + test('t-git-credential-netrc', + shell, + args: [ meson.current_source_dir() / 't-git-credential-netrc.sh' ], + workdir: meson.current_source_dir(), + env: credential_netrc_testenv, + depends: test_dependencies + bin_wrappers + [credential_netrc], + timeout: 0, + ) +endif diff --git a/contrib/subtree/meson.build b/contrib/subtree/meson.build index 9c72b236259..63714166a61 100644 --- a/contrib/subtree/meson.build +++ b/contrib/subtree/meson.build @@ -12,16 +12,18 @@ git_subtree = custom_target( install_dir: get_option('libexecdir') / 'git-core', ) -subtree_test_environment = test_environment -subtree_test_environment.prepend('PATH', meson.current_build_dir()) +if get_option('tests') + subtree_test_environment = test_environment + subtree_test_environment.prepend('PATH', meson.current_build_dir()) -test('t7900-subtree', shell, - args: [ 't7900-subtree.sh' ], - env: subtree_test_environment, - workdir: meson.current_source_dir() / 't', - depends: test_dependencies + bin_wrappers + [ git_subtree ], - timeout: 0, -) + test('t7900-subtree', shell, + args: [ 't7900-subtree.sh' ], + env: subtree_test_environment, + workdir: meson.current_source_dir() / 't', + depends: test_dependencies + bin_wrappers + [ git_subtree ], + timeout: 0, + ) +endif if get_option('docs').contains('man') subtree_xml = custom_target(