From patchwork Mon Mar 31 08:33:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14033325 Received: from fhigh-a2-smtp.messagingengine.com (fhigh-a2-smtp.messagingengine.com [103.168.172.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 210F819259E for ; Mon, 31 Mar 2025 08:33:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743410003; cv=none; b=TtilJOFnD0A6fRTKLQIAGmCnkqtSMjWA/pr4CkilJf0Iwrmj6WeK7O9fq4OOvRDyXNxktHOKqEtDwggabpRkUOTTQfPbxyXT9X/RkBDcVn1k+ro1BC6TPs8vbFGeOj7vzsY5AW3xc32oFJcc0h/nmni8/jSFHLeFwmdam6EP00U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743410003; c=relaxed/simple; bh=+85wQgxZapibTJyxHYYL1BellZADssfldDeTNYezOvs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mAGRRDEIAvsBbfFylBkKS29in9+8DHfy2u3/ZLRM2G/fHExdgdlbkmXATf8V5fs5zTNvsm3EGZxGCOvmoeR647OI0kwnDiHGzhKS+kRHIpvsRsidNUDfjFagK423qVvPxd52DhNKsuVxrQ02M7TADOdPjfK5BUPtyNrJKgerGtw= 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=jHBUmRki; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Il6OCOMz; arc=none smtp.client-ip=103.168.172.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="jHBUmRki"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Il6OCOMz" Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfhigh.phl.internal (Postfix) with ESMTP id 1D6241140126; Mon, 31 Mar 2025 04:33:21 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Mon, 31 Mar 2025 04:33:21 -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=1743410001; x=1743496401; bh=UvuRhQHY+QzPbQ5ifleLoseh5LLoW6Kd+EkMakkVxj4=; b= jHBUmRkiap1aOtUsTVJXLVk9kTLOwDWq7zzIDGYzjcAdiw9GJcRCsvUMP7HZCSh8 +6f/YaJ9W7DD2qgPwurL/55/8fPC4IWrEa8T1Tp7Gsv8cg4u7UeKvH59K5keGCNu CET8UnbYTN06MqHAl55fUqG7oYlIcUQXGhFU0Xkru2LgPku4xhwIghmhGqU5SlyX VVQCu5Fc2G+syui1tBhjDpLS0Rpo1kla6BFdSxx6k+je6W9LgqLS/0+YHsm8fb4c 0YiLeJmc5Lh7GLrHJQ8DPVIf/cXTOcbtQcaJBCaRCGs6YbWKrOy7dFniviT/0RxD F0YXGB6bucf737YkDfi5SQ== 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=1743410001; x= 1743496401; bh=UvuRhQHY+QzPbQ5ifleLoseh5LLoW6Kd+EkMakkVxj4=; b=I l6OCOMzyyIp6tFgXRYrK/eGx/KZuG/JpCk7YP8n9Hj+59BPi2e5RSuh/hBHPzeVF GzCc07crjyzHQwfqghFr5xFSyYBlEeZ5VD++pQJznTE0/mWZKP33a+/3znxa2lMJ 3ijVSCVuhR/rYjQuctgm12MN/J7O50RLU7qgcOSSdg0wRM8x0+agviURRUYY6md4 AuFiNKGsi0dHluoSBX1GG6lXViqvt6lozAC6NLl1Z538QHFEYQ3rjFbalAVUlv73 tcPSIq/YuycgoWbOkbv8L1HzXFCtQBA7tDROJUmUwVkbFzfqRCJ79YOlvBXl7LkW kE/qRAgCwCCY/uhqsIVuQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeelgeehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertder tdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhksh drihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteek udehjeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeejpdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopehjohhhrghnnhgvshdrshgthhhinhguvghlih hnsehgmhigrdguvgdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpdhr tghpthhtohepghhithesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehsrg hmsehgvghnthhoohdrohhrghdprhgtphhtthhopehtghesuggvsghirghnrdhorhhgpdhr tghpthhtohepphhsrdhrvghpohhrthesghhmgidrnhgvthdprhgtphhtthhopegvshgthh ifrghrthiisehgvghnthhoohdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 31 Mar 2025 04:33:19 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id bed2693a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 31 Mar 2025 08:33:16 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 31 Mar 2025 10:33:07 +0200 Subject: [PATCH v2 1/5] 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: <20250331-b4-pks-collect-build-fixes-v2-1-6b06136808f3@pks.im> References: <20250331-b4-pks-collect-build-fixes-v2-0-6b06136808f3@pks.im> In-Reply-To: <20250331-b4-pks-collect-build-fixes-v2-0-6b06136808f3@pks.im> To: git@vger.kernel.org Cc: Junio C Hamano , Sam James , Eli Schwartz , Thorsten Glaser , Peter Seiderer , 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 Mon Mar 31 08:33:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14033326 Received: from fout-a7-smtp.messagingengine.com (fout-a7-smtp.messagingengine.com [103.168.172.150]) (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 439311D54E2 for ; Mon, 31 Mar 2025 08:33:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.150 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743410003; cv=none; b=hDi2/tF0gWLsra3/5htMb7ioe4a9ekm06gFu1K/3fyPV+qiISmZHwh3dw3Oe5D+ZbspI0ei/oDVX5jUTQ46r/Qgq/3r6hhHGQIhKjfGTLJP2jMzqQSYO7zlSM9kRHGa/bw72ltkBxCLErstF66OLZIED/rw0HfJuk5VzdkVg/uc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743410003; c=relaxed/simple; bh=L/oXw5fkxxAALV+jPuSzhvNpqrmwQu2Xl46dqm/JvMc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rkR8t3bniKzHuIkyB72LwG3OZG7GfxImjUToWoMMWOa3srYv4cJQ+7qqFFwWCtSj6EIanpWyclMru4k1olLRC2JsboUqCcYNzzIdQ0wNWt8mv4dAxf8m9hmoSzHptNivpBpPC8bhr95f1m7QL8ABFUoeOqSgLJ67+w0injfjlHE= 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=lCsw4l/p; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=WfZOnjVe; arc=none smtp.client-ip=103.168.172.150 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="lCsw4l/p"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="WfZOnjVe" Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfout.phl.internal (Postfix) with ESMTP id 4EF1F1383C42; Mon, 31 Mar 2025 04:33:21 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Mon, 31 Mar 2025 04:33:21 -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=1743410001; x=1743496401; bh=YnFIXo8/GnTlyNAp6sWU5pl2bll/1dH35dzFahsEJD8=; b= lCsw4l/pCK5xKsK0Net9TkcaesdHD8xJi2ouq+EE1mCN9FaFQEgKbBueFNo1+Fmd /zFi+PxfpFZt54TA/AMRCOiOOxjAxJlRLO1IU67IbXolR34CNnEcUteFz8NSs+/a /3XkjEM/sYxgNNnmbwaF8c1cp+0e+g+PBguRfH6sDOhx7HB7v/JkwBScSjIT0/oz UIhZ9wRBs3PvVNbgldN8uE8Ky/WrdXNXgCiBnzfc+o20l2KLeYwYsBdrbMD3JGL/ YQO7LBYtDIzox76L+SEer4imFSWcdjTDPAOnkU8cFgMB6B6caahSj1MfWiYupj4w jYY5KoLrF5pJ7iAdE+Dfgw== 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=1743410001; x= 1743496401; bh=YnFIXo8/GnTlyNAp6sWU5pl2bll/1dH35dzFahsEJD8=; b=W fZOnjVeuDDHjALxiJJLTDNw8q05IcTXzCK5EFrM6U2pd21FxGvyWi0PU1dARxU97 lPPJrsb/W5M7txIMqVOi8lrSC3h5mScENWJxK5dC3mlkP4P40mrUu3lAFKLbXot9 6z8Sg6jrd1jE7UmgjYnWYksrGzGa6x1y0m3TmySoTyOUjbIlC60OSY/QxhZM7rZU uNcj/lqXwVJALu0Dpoy/lPCEOwfJDZouXZuEeIMyR+WpCf92/usRvGzXfFKdMrP0 uxcGK4rJjL4XTUAXpbrrOQGukPE+uK8VX/8tj/gOYWUbPxiwLdOXGDl9WzqaFSLp fjQWTjkawF2dEWgA4C4ow== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeelgeehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertder tdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhksh drihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteek udehjeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeejpdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorh hgpdhrtghpthhtohepvghstghhfigrrhhtiiesghgvnhhtohhordhorhhgpdhrtghpthht ohepghhithhsthgvrhesphhosghogidrtghomhdprhgtphhtthhopehtghesuggvsghirg hnrdhorhhgpdhrtghpthhtohepphhsrdhrvghpohhrthesghhmgidrnhgvthdprhgtphht thhopehsrghmsehgvghnthhoohdrohhrghdprhgtphhtthhopehjohhhrghnnhgvshdrsh gthhhinhguvghlihhnsehgmhigrdguvg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 31 Mar 2025 04:33:19 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 2b242e15 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 31 Mar 2025 08:33:17 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 31 Mar 2025 10:33:08 +0200 Subject: [PATCH v2 2/5] 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: <20250331-b4-pks-collect-build-fixes-v2-2-6b06136808f3@pks.im> References: <20250331-b4-pks-collect-build-fixes-v2-0-6b06136808f3@pks.im> In-Reply-To: <20250331-b4-pks-collect-build-fixes-v2-0-6b06136808f3@pks.im> To: git@vger.kernel.org Cc: Junio C Hamano , Sam James , Eli Schwartz , Thorsten Glaser , Peter Seiderer , 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 Mon Mar 31 08:33:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14033327 Received: from fout-a7-smtp.messagingengine.com (fout-a7-smtp.messagingengine.com [103.168.172.150]) (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 92D601DDC15 for ; Mon, 31 Mar 2025 08:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.150 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743410005; cv=none; b=DtV3RPY9Bqn1tMgs7q92M/GhWYfEVz3nUuyH/7aupZH94OMMpGPEA3tQpgksM4XRLEGldgRVRie4AbKW/cp8vYy1yJ3SSpRjx60oRO2zNgwZ6AHq6HXZ5M12OyYREfRHcGeknCgJx7o2oxX9E+6QgyI6s29VzAIw4OKSyNI9plU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743410005; c=relaxed/simple; bh=BhNZMenuh3xEvzm0xpw7VqyKTS0kGxQK/qqjmOyswtU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nC5Y03/RxoWEq2xZBSuJxrwgi/tLgfnEqvyyIBMi8F/9FHcuo4CijTPpF/JslvTW1pFPNLe4Zi3ciJve01wRtZHHyGRuCE3PDoAtbo5bThNsfPtduuVV6Me/IjDTnfp/IjjVtnfD1U5Wqv2XYvt4bTI6kRfCDe8UaQojqGw8R/g= 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=aSGqHBDU; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=JYs1Tfvl; arc=none smtp.client-ip=103.168.172.150 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="aSGqHBDU"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="JYs1Tfvl" Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47]) by mailfout.phl.internal (Postfix) with ESMTP id AB57B138434A; Mon, 31 Mar 2025 04:33:22 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-07.internal (MEProxy); Mon, 31 Mar 2025 04:33:22 -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=1743410002; x=1743496402; bh=PJiFlBzxLFGSQ1MlXrf2verHVIp3sNV7Uw3S6koMkLk=; b= aSGqHBDUO8U5IQx6A/m67pmjNj/WmGGr+JgOXvDCUI3HvqwijHM1iFPa3A6pauV5 4NlnThPV1yW/SoxjIJbr9JclFOMuQZqHZRThqTypD/GM0SWExni37KZcPzZlRa8t vSERP8yyAPtsYY/Zv+8mu8P+/c3A6z9zEaY+cepWwHL+tol6nJL1oYa4gmLJdhn1 ytgOZkqydPWp+hexcLYyHG4CLjQAJtk99QBuUzymFuJuqegWQ4nHZO/cCbKqgXFn zMWkxgUrDaSxxhd7TdNg5AeNTVAKZ9rXiaRKW2hVBGhyDhOcjFvkF+J5VsiQ6LLy dEKsc6ZUW11LPR+4/OQjGQ== 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=1743410002; x= 1743496402; bh=PJiFlBzxLFGSQ1MlXrf2verHVIp3sNV7Uw3S6koMkLk=; b=J Ys1TfvldP6je7cZFA3eDt7okI0UWGTU8NnbuIdaerbE2EDtVDrGmEkERqjIF9bmJ G2s1y/4Jes/C/usSCxw+gRtOmtUoaIbqX9xxl2achwUSdCBXy2XVxFrwmVvhiRqj R8/Oh1LSkrKmagH32ksSlZrYeBt5TvxhQESOzm4b+jFI/Je8oQT4gylgFdRIoKNo DDVSrmaNcFsvD3yY2rSgNcQ8wF6C5Ba5HzU+jGNAMFg5lMsloIJBna+btJUTKu+7 d95gFgJbVvaHnvFwoglcWOOoctIRc0dw6VvvQ1h62pAT5ANaxtztIeGadjqcf58p jXwwamc6I6l6lLbvqXL1w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeelgeehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertder tdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhksh drihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteek udehjeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeejpdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopegvshgthhifrghrthiisehgvghnthhoohdroh hrghdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpdhrtghpthhtohep thhgseguvggsihgrnhdrohhrghdprhgtphhtthhopehjohhhrghnnhgvshdrshgthhhinh guvghlihhnsehgmhigrdguvgdprhgtphhtthhopehpshdrrhgvphhorhhtsehgmhigrdhn vghtpdhrtghpthhtohepghhithesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtth hopehsrghmsehgvghnthhoohdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 31 Mar 2025 04:33:21 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id bd040e36 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 31 Mar 2025 08:33:18 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 31 Mar 2025 10:33:09 +0200 Subject: [PATCH v2 3/5] 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: <20250331-b4-pks-collect-build-fixes-v2-3-6b06136808f3@pks.im> References: <20250331-b4-pks-collect-build-fixes-v2-0-6b06136808f3@pks.im> In-Reply-To: <20250331-b4-pks-collect-build-fixes-v2-0-6b06136808f3@pks.im> To: git@vger.kernel.org Cc: Junio C Hamano , Sam James , Eli Schwartz , Thorsten Glaser , Peter Seiderer , 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( From patchwork Mon Mar 31 08:33:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14033329 Received: from fhigh-a2-smtp.messagingengine.com (fhigh-a2-smtp.messagingengine.com [103.168.172.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 1CA3D1DDC2A for ; Mon, 31 Mar 2025 08:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743410006; cv=none; b=dmqQ0l3x43CojpVpkYVx1v+GmFQr8dOS+avrY7m3OQNniF8HcldS7mXcR3tRM2gy/r3VGoZjE5xDFbc1VBojNgRgtnrSmXspVk/4pNxSA3I4JbbRTDfg26i5xZtfCzpcI5tWJ1P2CSOn0vl6jGI+98EtOO5aSmjkeqtyZiDD4HM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743410006; c=relaxed/simple; bh=J+pEa1ide/Se74jdpvRyLrNUDtn4wWvJGmy1LCoQtTw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Q2EUPozSjugfgyim8ohgAMmMafzZ4wg9hm1MRllWMguTizY7k5IuW27BWb8YDJORLEhQtF9qFMopoA+0HcWSQOHjyZJEYz9jRsG/CQxYxATM7ulbQ9OmI1ci9cCrOhRSvmCTILVzPVAreeTvVMNm15JfVGsMrq5+fEXCMCJK6lE= 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=PbuWyhM6; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=WmTBtCfx; arc=none smtp.client-ip=103.168.172.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="PbuWyhM6"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="WmTBtCfx" Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id 1FC89114008F; Mon, 31 Mar 2025 04:33:23 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Mon, 31 Mar 2025 04:33:23 -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=1743410003; x=1743496403; bh=ln3+rGRrZN+7eClGfI1lSUDarKZ06mgvSovSFUKIISk=; b= PbuWyhM632wwOG9xz5N5Nls19EpJgTLbXK7VOi+VbOOZOro2kZzowjBS19vuLZOo g2+lQ2tZWTUl+lQBhYDC63C2DEN1HfwPInC9mV8JQlxkGUx3hl0iGGUBoQVjDbfb thhkVEgibJLsPNpvw/xHLjdSTB3C5AEznKNfIcyvmKVJd5fClKYn6/GebGoXfbCG ESI/ha9ZmWeQQRBdUBDywTJ6JdliWz49rrHjjDtBajzbeVLZVyUhrRBWAL/ae7m7 pzAK/a0ZutX16pPca0nLI1xa4Nwiom4LIjvQws6Iq8ojw6SD0Uhw2sqdT5b2QQXD V/d1+ZJbLum86GuLxdOFWg== 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=1743410003; x= 1743496403; bh=ln3+rGRrZN+7eClGfI1lSUDarKZ06mgvSovSFUKIISk=; b=W mTBtCfxbmaOqaTfhkhj7uersRl7gt5p8oGJhIVBeNo4vPXO7vogR7JztHhZHW69i 8cb+yfmIFdQe4nCaTMSGFqT+0pmsY+pJJWkrZCt8Pt8NMSy3bE3Km9kYqi6tydB6 OKpg6mVStY2RYmiHa7KezsH1fxq9ydAJ19saDiNY6yjPzwAZSf1AP/N0ZLKjFFPv 7xvK9ORdwMRQOTkvR+VEW7Vx1d2tb12Jrsg4iSyGt7ypXWPlh6ikYEsZCjKKAvqq m19I4h6WmV4LnXfCCrrDMsYMx736RXSre+cUJ2vUrCQudqesuwojnfKRoEJP1xDo QE3rT+FK0muQABeW3xqIw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeelgeehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertder tdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhksh drihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteek udehjeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeejpdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpd hrtghpthhtohepphhsrdhrvghpohhrthesghhmgidrnhgvthdprhgtphhtthhopehgihht sehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohepvghstghhfigrrhhtiiesgh gvnhhtohhordhorhhgpdhrtghpthhtohepthhgseguvggsihgrnhdrohhrghdprhgtphht thhopehjohhhrghnnhgvshdrshgthhhinhguvghlihhnsehgmhigrdguvgdprhgtphhtth hopehsrghmsehgvghnthhoohdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 31 Mar 2025 04:33:21 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id f6035dd1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 31 Mar 2025 08:33:19 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 31 Mar 2025 10:33:10 +0200 Subject: [PATCH v2 4/5] meson: distinguish build and target host binaries Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250331-b4-pks-collect-build-fixes-v2-4-6b06136808f3@pks.im> References: <20250331-b4-pks-collect-build-fixes-v2-0-6b06136808f3@pks.im> In-Reply-To: <20250331-b4-pks-collect-build-fixes-v2-0-6b06136808f3@pks.im> To: git@vger.kernel.org Cc: Junio C Hamano , Sam James , Eli Schwartz , Thorsten Glaser , Peter Seiderer , Johannes Schindelin X-Mailer: b4 0.14.2 Almost all of the tools we discover during the build process need to be native programs. There are only a handful of exceptions, which typically are programs whose paths we need to embed into the resulting executable so that they can be found on the target system when Git executes. While this distinction typically doesn't matter, it does start to matter when considering cross-compilation where the build and target machines are different. Meson supports cross-compilation via so-called machine files. These machine files allow the user to override parameters for the build machine, but also for the target machine when cross-compiling. Part of the machine file is a section that allows the user to override the location where binaries are to be found in the target system. The following machine file would for example override the path of the POSIX shell: [binaries] sh = '/usr/xpg4/bin/sh' It can be handed over to Meson via `meson setup --cross-file`. We do not handle this correctly right now though because we don't know to distinguish binaries for the build and target hosts at all. Address this by explicitly passing the `native:` parameter to `find_program()`: - When set to `true`, we get binaries discovered on the build host. - When set to `false`, we get either the path specified in the machine file. Or, if no machine file exists or it doesn't specify the binary path, then we fall back to the binary discovered on the build host. As mentioned, only a handful of binaries are not native: only the system shell, Python and Perl need to be treated specially here. Reported-by: Peter Seiderer Signed-off-by: Patrick Steinhardt --- Documentation/meson.build | 12 ++++----- gitweb/meson.build | 2 +- meson.build | 66 ++++++++++++++++++++++++++++++++++++----------- templates/meson.build | 4 +-- 4 files changed, 60 insertions(+), 24 deletions(-) diff --git a/Documentation/meson.build b/Documentation/meson.build index 594546d68b1..32f0c5de12a 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -207,9 +207,9 @@ manpages = { docs_backend = get_option('docs_backend') if docs_backend == 'auto' - if find_program('asciidoc', dirs: program_path, required: false).found() + if find_program('asciidoc', dirs: program_path, native: true, required: false).found() docs_backend = 'asciidoc' - elif find_program('asciidoctor', dirs: program_path, required: false).found() + elif find_program('asciidoctor', dirs: program_path, native: true, required: false).found() docs_backend = 'asciidoctor' else error('Neither asciidoc nor asciidoctor were found.') @@ -217,7 +217,7 @@ if docs_backend == 'auto' endif if docs_backend == 'asciidoc' - asciidoc = find_program('asciidoc', dirs: program_path) + asciidoc = find_program('asciidoc', dirs: program_path, native: true) asciidoc_html = 'xhtml11' asciidoc_docbook = 'docbook' xmlto_extra = [ ] @@ -246,7 +246,7 @@ if docs_backend == 'asciidoc' asciidoc_conf, ] elif docs_backend == 'asciidoctor' - asciidoctor = find_program('asciidoctor', dirs: program_path) + asciidoctor = find_program('asciidoctor', dirs: program_path, native: true) asciidoc_html = 'xhtml5' asciidoc_docbook = 'docbook5' xmlto_extra = [ @@ -288,7 +288,7 @@ if get_option('breaking_changes') asciidoc_common_options += ['--attribute', 'with-breaking-changes'] endif -xmlto = find_program('xmlto', dirs: program_path) +xmlto = find_program('xmlto', dirs: program_path, native: true) cmd_lists = [ 'cmds-ancillaryinterrogators.adoc', @@ -409,7 +409,7 @@ if get_option('docs').contains('html') pointing_to: 'git.html', ) - xsltproc = find_program('xsltproc', dirs: program_path) + xsltproc = find_program('xsltproc', dirs: program_path, native: true) user_manual_xml = custom_target( command: asciidoc_common_options + [ diff --git a/gitweb/meson.build b/gitweb/meson.build index 89b403dc9de..88a54b4dc99 100644 --- a/gitweb/meson.build +++ b/gitweb/meson.build @@ -1,5 +1,5 @@ gitweb_config = configuration_data() -gitweb_config.set_quoted('PERL_PATH', perl.full_path()) +gitweb_config.set_quoted('PERL_PATH', target_perl.full_path()) gitweb_config.set_quoted('CSSMIN', '') gitweb_config.set_quoted('JSMIN', '') gitweb_config.set_quoted('GIT_BINDIR', get_option('prefix') / get_option('bindir')) diff --git a/meson.build b/meson.build index a8d1e63ccc6..79a50599ba8 100644 --- a/meson.build +++ b/meson.build @@ -155,6 +155,37 @@ # These machine files can be passed to `meson setup` via the `--native-file` # option. # +# Cross compilation +# ================= +# +# Machine files can also be used in the context of cross-compilation to +# describe the target machine as well as the cross-compiler toolchain that +# shall be used. An example machine file could look like the following: +# +# [binaries] +# c = 'x86_64-w64-mingw32-gcc' +# cpp = 'x86_64-w64-mingw32-g++' +# ar = 'x86_64-w64-mingw32-ar' +# windres = 'x86_64-w64-mingw32-windres' +# strip = 'x86_64-w64-mingw32-strip' +# exe_wrapper = 'wine64' +# sh = 'C:/Program Files/Git for Windows/usr/bin/sh.exe' +# +# [host_machine] +# system = 'windows' +# cpu_family = 'x86_64' +# cpu = 'x86_64' +# endian = 'little' +# +# These machine files can be passed to `meson setup` via the `--cross-file` +# option. +# +# Note that next to the cross-compiler toolchain, the `[binaries]` section is +# also used to locate a couple of binaries that will be built into Git. This +# includes `sh`, `python` and `perl`, so when cross-compiling Git you likely +# want to set these binary paths in addition to the cross-compiler toolchain +# binaries. +# # Subproject wrappers # =================== # @@ -173,7 +204,7 @@ project('git', 'c', # The version is only of cosmetic nature, so if we cannot find a shell yet we # simply don't set up a version at all. This may be the case for example on # Windows systems, where we first have to bootstrap the host environment. - version: find_program('sh', required: false).found() ? run_command( + version: find_program('sh', native: true, required: false).found() ? run_command( 'GIT-VERSION-GEN', meson.current_source_dir(), '--format=@GIT_VERSION@', capture: true, check: true, @@ -198,16 +229,18 @@ elif host_machine.system() == 'windows' program_path = [ 'C:/Program Files/Git/bin', 'C:/Program Files/Git/usr/bin' ] endif -cygpath = find_program('cygpath', dirs: program_path, required: false) -diff = find_program('diff', dirs: program_path) -git = find_program('git', dirs: program_path, required: false) -sed = find_program('sed', dirs: program_path) -shell = find_program('sh', dirs: program_path) -tar = find_program('tar', dirs: program_path) +cygpath = find_program('cygpath', dirs: program_path, native: true, required: false) +diff = find_program('diff', dirs: program_path, native: true) +git = find_program('git', dirs: program_path, native: true, required: false) +sed = find_program('sed', dirs: program_path, native: true) +shell = find_program('sh', dirs: program_path, native: true) +tar = find_program('tar', dirs: program_path, native: true) + +target_shell = find_program('sh', dirs: program_path, native: false) # Sanity-check that programs required for the build exist. foreach tool : ['cat', 'cut', 'grep', 'sort', 'tr', 'uname'] - find_program(tool, dirs: program_path) + find_program(tool, dirs: program_path, native: true) endforeach script_environment = environment() @@ -706,7 +739,7 @@ libgit_c_args = [ '-DGIT_LOCALE_PATH="' + get_option('localedir') + '"', '-DGIT_MAN_PATH="' + get_option('mandir') + '"', '-DPAGER_ENV="' + get_option('pager_environment') + '"', - '-DSHELL_PATH="' + fs.as_posix(shell.full_path()) + '"', + '-DSHELL_PATH="' + fs.as_posix(target_shell.full_path()) + '"', ] libgit_include_directories = [ '.' ] libgit_dependencies = [ ] @@ -761,6 +794,7 @@ endif build_options_config.set_quoted('X', executable_suffix) python = import('python').find_installation('python3', required: get_option('python')) +target_python = find_program('python3', native: false, required: python.found()) if python.found() build_options_config.set('NO_PYTHON', '') else @@ -790,9 +824,11 @@ endif # which we can do starting with Meson 1.5.0 and newer, or we have to # match against the minor version. if meson.version().version_compare('>=1.5.0') - perl = find_program('perl', dirs: program_path, required: perl_required, version: '>=5.26.0', version_argument: '-V:version') + perl = find_program('perl', dirs: program_path, native: true, required: perl_required, version: '>=5.26.0', version_argument: '-V:version') + target_perl = find_program('perl', dirs: program_path, native: false, required: perl.found(), version: '>=5.26.0', version_argument: '-V:version') else - perl = find_program('perl', dirs: program_path, required: perl_required, version: '>=26') + perl = find_program('perl', dirs: program_path, native: true, required: perl_required, version: '>=26') + target_perl = find_program('perl', dirs: program_path, native: false, required: perl.found(), version: '>=26') endif perl_features_enabled = perl.found() and get_option('perl').allowed() if perl_features_enabled @@ -843,7 +879,7 @@ else build_options_config.set('NO_PTHREADS', '1') endif -msgfmt = find_program('msgfmt', dirs: program_path, required: false) +msgfmt = find_program('msgfmt', dirs: program_path, native: true, required: false) gettext_option = get_option('gettext').disable_auto_if(not msgfmt.found()) if not msgfmt.found() and gettext_option.enabled() error('Internationalization via libintl requires msgfmt') @@ -1974,9 +2010,9 @@ foreach key, value : { 'GIT_TEST_TEMPLATE_DIR': meson.project_build_root() / 'templates', 'GIT_TEST_TEXTDOMAINDIR': meson.project_build_root() / 'po', 'PAGER_ENV': get_option('pager_environment'), - 'PERL_PATH': perl.found() ? perl.full_path() : '', - 'PYTHON_PATH': python.found () ? python.full_path() : '', - 'SHELL_PATH': shell.full_path(), + 'PERL_PATH': target_perl.found() ? target_perl.full_path() : '', + 'PYTHON_PATH': target_python.found () ? target_python.full_path() : '', + 'SHELL_PATH': target_shell.full_path(), 'TAR': tar.full_path(), 'TEST_OUTPUT_DIRECTORY': test_output_directory, 'TEST_SHELL_PATH': shell.full_path(), diff --git a/templates/meson.build b/templates/meson.build index 1faf9a44cea..02e6eebe80b 100644 --- a/templates/meson.build +++ b/templates/meson.build @@ -1,6 +1,6 @@ template_config = configuration_data() -template_config.set('PERL_PATH', perl.found() ? fs.as_posix(perl.full_path()) : '') -template_config.set('SHELL_PATH', fs.as_posix(shell.full_path())) +template_config.set('PERL_PATH', target_perl.found() ? fs.as_posix(target_perl.full_path()) : '') +template_config.set('SHELL_PATH', fs.as_posix(target_shell.full_path())) template_config.set('GITWEBDIR', fs.as_posix(get_option('prefix') / get_option('datadir') / 'gitweb')) configure_file( From patchwork Mon Mar 31 08:33:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14033328 Received: from fhigh-a2-smtp.messagingengine.com (fhigh-a2-smtp.messagingengine.com [103.168.172.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 4F6411DE2D7 for ; Mon, 31 Mar 2025 08:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743410005; cv=none; b=d7yahz7gtNeIs4uyv0XkyX63ZEqDAGDtCMbBeE5R6g3lmX2KzCKsTon2PAZCUjAmiOPUUvw/rsme4N5D45D9BzzIZRuxjrUOXDNipcfvsn2RG0XLk8oxabIGxY28spXUqaJWv6tCOQ3t6tJk8m26RdcbW7WtvNiKs/30G+Nnt5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743410005; c=relaxed/simple; bh=GkcsVxfcOy3lSuJeYU+rasAEWRgcZUFf8MpqINDbG8U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aGrXoeZDaTF9mpSVSv0TyTdQnGB8aVobPeuCEGGqgK+MQwIWdXtWkSa8KpX5864CkBMCMpgt6W+JXPCETQUjcSERaIugQ3bBguNnQzys3x3oNEYVplGRqQ18StTTdLVIcDkjXhKMcTEoSKLwAMX6S+dPCX3/w/AmOowBBfEEL1g= 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=jRJAaGqm; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=FxK6j68S; arc=none smtp.client-ip=103.168.172.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="jRJAaGqm"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="FxK6j68S" Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfhigh.phl.internal (Postfix) with ESMTP id 66811114013B; Mon, 31 Mar 2025 04:33:23 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-02.internal (MEProxy); Mon, 31 Mar 2025 04:33:23 -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=1743410003; x=1743496403; bh=gpI825NTlcy1PWNBuBui9JKs2txUBdBcIxorCVook3M=; b= jRJAaGqm46BfesA2mVCq+QSudT+tZSdO//3jxgSQfLIZYUgPsYQvm1CIQHhCXG8+ a3wiHNXGO6RmJGdnyYHTq3q2fBVYnaiAyptUqSABPL0zDVDVvevEvvBsphSUQM+K lVgRz2XjAYkOQJdwLW8kHPCVjNslT4CK/3K/gRYZd/WEkxDi/5Gi6zgks6JbqE8d R+C0qHiI11nbItfNwK90BjvrszXu5XHEs7qFw0j5brWbIwZa84rqDuaKObhP/oni 0BpoCXb5vUKtbfsXaRwiEBw4EhSqK2hPxThXj+ABa7+QjO7itv9+l9IgFu8XL4RR tI0+D/oy3AqFDyeDLEmfJg== 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=1743410003; x= 1743496403; bh=gpI825NTlcy1PWNBuBui9JKs2txUBdBcIxorCVook3M=; b=F xK6j68St3Kdk9XnKiKL0OuwUFZ35mFjlf9TNe+JLzNS0hggvJj8sYBUIGTZ9mAJ3 VJGKcUvjDKuTvMHagXEhKFhHLpNrfbVv/7iXmES3DAmOy3Ox0EAPmuT5ImDiDJDR ubvbR8lzogDgnF8AI+N0zcoALNSvb9O/pHzqZSsI9XubHom6v4mX7KUekv39UH9L GUK5ozOHWwIZeE9ME9Sf5kw6QrxIN/IZeomU7hxS6/cbaoGP9/HLAkjqT+A1iuI1 kPPiUqDs6LYDi2wgAU7qLHPFpWufEyQAGK7g0jCMleniS+BOEdh/YgTMB+dskqRq X06xJhnvqWKWFDoNF0G0w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeelgeehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertder tdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhksh drihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteek udehjeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeejpdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopehjohhhrghnnhgvshdrshgthhhinhguvghlih hnsehgmhigrdguvgdprhgtphhtthhopehsrghmsehgvghnthhoohdrohhrghdprhgtphht thhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohepvghstghhfi grrhhtiiesghgvnhhtohhordhorhhgpdhrtghpthhtohepthhgseguvggsihgrnhdrohhr ghdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpdhrtghpthhtohepph hsrdhrvghpohhrthesghhmgidrnhgvth X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 31 Mar 2025 04:33:21 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 1e5d91ff (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 31 Mar 2025 08:33:20 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 31 Mar 2025 10:33:11 +0200 Subject: [PATCH v2 5/5] ci: use Visual Studio for win+meson job on GitHub Workflows Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250331-b4-pks-collect-build-fixes-v2-5-6b06136808f3@pks.im> References: <20250331-b4-pks-collect-build-fixes-v2-0-6b06136808f3@pks.im> In-Reply-To: <20250331-b4-pks-collect-build-fixes-v2-0-6b06136808f3@pks.im> To: git@vger.kernel.org Cc: Junio C Hamano , Sam James , Eli Schwartz , Thorsten Glaser , Peter Seiderer , Johannes Schindelin X-Mailer: b4 0.14.2 In 7304bd2bc39 (ci: wire up Visual Studio build with Meson, 2025-01-22) we have wired up a new CI job that builds and tests Git with Meson on a Windows machine. The expectation here was that this build uses the Visual Studio toolchain to do so, and that is true on GitLab CI. But on GitHub Workflows it is not the case because we've got GCC in our PATH, and thus Meson favors that compiler toolchain over Visual Studio's. Fix this by explicitly asking Meson to use the Visual Studio toolchain. While this is only really required for GitHub Workflows, let's also pass the flag in GitLab CI so that we don't implicitly assume the toolchain that Meson is going to pick. Reported-by: Johannes Schindelin Signed-off-by: Patrick Steinhardt --- .github/workflows/main.yml | 2 +- .gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9959b61ece2..6a002485aeb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -265,7 +265,7 @@ jobs: run: pip install meson ninja - name: Setup shell: pwsh - run: meson setup build -Dperl=disabled -Dcredential_helpers=wincred + run: meson setup build --vsenv -Dperl=disabled -Dcredential_helpers=wincred - name: Compile shell: pwsh run: meson compile -C build diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2805cdeecb6..4798b283745 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,7 +164,7 @@ build:msvc-meson: extends: .msvc-meson stage: build script: - - meson setup build -Dperl=disabled -Dbackend_max_links=1 -Dcredential_helpers=wincred + - meson setup build --vsenv -Dperl=disabled -Dbackend_max_links=1 -Dcredential_helpers=wincred - meson compile -C build artifacts: paths: