From patchwork Tue Feb 18 15:30:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oliver X-Patchwork-Id: 13980174 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCF5B267384 for ; Tue, 18 Feb 2025 15:31:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739892666; cv=none; b=XF19u2KWuF33/g0z5Tn1xl/biwCUODkxaXGjYf1EQOtsU9FsB4rMh+6LdIru/8epi23YsfREU7hFRerAMa0XWB4fMitDy83zbSbqpKL4hg3OIjbiPmlJ8ojSaIpL4dOjTo0nxu1kjPZQNTEqWUzwxEawUF5nvOBY5l+00aqBapI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739892666; c=relaxed/simple; bh=CZDIN2iNT+5J0K3ClvIWFNi8uzZqiggQO34mgSuOARc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BBVGiZPxZCkRqxbiTWhsGX5Cs3yLK1fArzGAar5sG65ZlnM0uW/YCpWbmhHqwWZYvgUH5MWV9sf1mDLE8iLho0/3YZ0oZcx7l+cOZgz36QWI1pqz09zTv8q/BjXP9uR6VKf2Hi6vyNQ37/IdOO7ZSeic62KsYqfBufT7dUwgecA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mavit.org.uk; spf=pass smtp.mailfrom=mavit.org.uk; dkim=pass (1024-bit key) header.d=mavit.org.uk header.i=@mavit.org.uk header.b=FHqsmxOo; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mavit.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mavit.org.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mavit.org.uk header.i=@mavit.org.uk header.b="FHqsmxOo" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-43962f7b0e4so34790365e9.3 for ; Tue, 18 Feb 2025 07:31:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mavit.org.uk; s=google; t=1739892663; x=1740497463; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=SOjmoujGXrNSarW+M+IiCievIUP8NBhJv073C7H5pD0=; b=FHqsmxOofLVYLja6GedEBECPCu46lMPCiS/Ok3PCgpNceD0ww0nzYPAUmdOFDbN8fK 9AEeMqR1nM7XuuilKbjnZ/xtD+xh0sf2OwkL54hNjvnsMNMRwA91whUx/UO2pl1VkiKC saBE9U7uN9oXvXLv+dTOYV9VZMFBWsnrnj/Q8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739892663; x=1740497463; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SOjmoujGXrNSarW+M+IiCievIUP8NBhJv073C7H5pD0=; b=uH2W25ZXWlYDtb6x4+7hZ1OxaDzb2BJMCmKG7zCLcqLB46EUPZJ0n5Es3uR8zeiMLb PjCgi+qmZO4mA8TyP/UNkrXmpRT+VfhR7A0o9ONHS1GSGPGtGHOsUDaFpWrdXVjdAX++ TDXattElhnJrrWEgTg6ftCfQGYv7FImv/naPGNACC7Ja5U01te2lZkS2DuOO9uBPFELo HPjHBicCinya4uoS1wWf/iPiFkTbtSYE+Ae4nDZDWvqs06mR0WCN+0cZv60QMQswjgCH AalNA3Tm9bm6I3h7VUvpcDdBsEXBGV83pLjIBASaQ1IvEu2T4RdBOkfKCLUVRNfIyfb2 lyHA== X-Forwarded-Encrypted: i=1; AJvYcCXhzSrxKAJwhwQcqYKV0eHencWh47yNKLByEUPyV2Ji7oKlTMd38bnPYnn1XHctJD2ZF+Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yyi+zvE+DsVF1C9hpk8rt4sUQu17VTKnrzvsqKaqwLhBEOi9XmC OPOz5mJWHaZDNNwU6p40rZQOuQ6lMLxTLm6SHvtOibyx3ZcfhI1zRqZpKuKAxA== X-Gm-Gg: ASbGncvFTW7DPWEVGdnJctq27rYFM/zGvV8I/fSoqE1QSffgEzmPMihz17lC0yqEZhg k5nUQ0aB4H0/h01KyQlZ2+MsB1+gsB2hipRvQuJRk/OQ2YEZy68HFS+liGikR4iqNIeV49GjivN cFjj/5Hhcg4+RJ2F9HrlUsYPOvs0BJW6uBjBVrMMSbaaSohgUN8EcqzXANFZp42UnnuDfPicsXo KtogPXnIr105a5qaqplz45BOULXLmaUc7GKkqbTneo16lH+6A2fZPPTgQi3s7KiIqP6EakDS+1E qpdy1BFLj03+bKkE0QpT2fQC66+giRxYX2YzppUXv8Xf6nBzJcswcLKOVZQbvtx+6lJPGd/IW6t s70JBB81mjRA8SLjDYKs= X-Google-Smtp-Source: AGHT+IHcX0AlglQ2R0E+bnnWK+8hY1ezOapLLfpzc2qJZUnmnTNQYtE8NTS+EARf9pvX36UZbLXYOw== X-Received: by 2002:a05:600c:1d23:b0:434:feb1:adcf with SMTP id 5b1f17b1804b1-4396e75022emr92286075e9.25.1739892662817; Tue, 18 Feb 2025 07:31:02 -0800 (PST) Received: from froglet.home.mavit.org.uk (dudl-14-b2-v4wan-165812-cust3365.vm31.cable.virginm.net. [82.34.125.38]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4396b0aa4e9sm115080455e9.16.2025.02.18.07.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 07:31:02 -0800 (PST) Sender: Peter Oliver From: Peter Oliver X-Google-Original-From: Peter Oliver Received: from froglet.home.mavit.org.uk (localhost [127.0.0.1]) by froglet.home.mavit.org.uk (8.18.1/8.17.1) with ESMTPS id 51IFV1eZ063560 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 18 Feb 2025 15:31:01 GMT Received: (from mavit@localhost) by froglet.home.mavit.org.uk (8.18.1/8.18.1/Submit) id 51IFV1j7063559; Tue, 18 Feb 2025 15:31:01 GMT To: gitster@pobox.com Cc: ps@pks.im, git@vger.kernel.org, Peter Oliver Subject: [PATCH v3 1/2] meson: bump minimum required Perl version to 5.26.0 Date: Tue, 18 Feb 2025 15:30:42 +0000 Message-ID: <20250218153043.63535-2-git@mavit.org.uk> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250218153043.63535-1-git@mavit.org.uk> References: <20250218153043.63535-1-git@mavit.org.uk> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Commit 702d8c1f3b (Require Perl 5.26.0, 2024-10-23) dropped support for Perl versions older than 5.26.0. The Meson build system, which has been developed in parallel to that commit, hasn't been bumped accordingly and thus still requires Perl 5.8.1 or newer. Fix this by requiring Perl 5.26.0 or newer with Meson. Signed-off-by: Peter Oliver --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 0064eb64f5..f01d81b39f 100644 --- a/meson.build +++ b/meson.build @@ -755,7 +755,7 @@ endif # Note that we only set NO_PERL if the Perl features were disabled by the user. # It may not be set when we have found Perl, but only use it to run tests. -perl = find_program('perl', version: '>=5.8.1', dirs: program_path, required: perl_required) +perl = find_program('perl', version: '>=5.26.0', dirs: program_path, required: perl_required) perl_features_enabled = perl.found() and get_option('perl').allowed() if perl_features_enabled build_options_config.set('NO_PERL', '') From patchwork Tue Feb 18 15:30:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Oliver X-Patchwork-Id: 13980175 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33FB426BD92 for ; Tue, 18 Feb 2025 15:31:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.68 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739892669; cv=none; b=pd1A9MUftICjIGGp9liZUEkhGJULlx+iImxdbsSQyBy/JpCXv4K1LefXkgZl9GgVkDfSC1FPZ+NEsPj+DDb62FVngwBXnBLv67oJdQQExjGocKQFhlaOUmeha26NIv5sYIzBtbx4T1psPN/CEvFRlNUX3fOk9BVsCJbeL0vncvI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739892669; c=relaxed/simple; bh=uTfgEAqTydZsnQEivvmLsy1Zg0yhOncLuhAxzj1pjFU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ehe5EdQ6DVLJJn+JMo92AtsMj/d3/cLiJnfhly0Bm6BEd5QHM6qkZM1IVvMNwgiXfoLjLSI1RRN4t2bE5ICb8CXwY/HUJV+QpzVc3DOpz74Ga63MPABChhoekZhDxXla8tZbVLkVZjRr82+SOZNkNxeXYMzjyfzOmXpiIUPRi+M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mavit.org.uk; spf=pass smtp.mailfrom=mavit.org.uk; dkim=pass (1024-bit key) header.d=mavit.org.uk header.i=@mavit.org.uk header.b=VA8VBdqB; arc=none smtp.client-ip=209.85.128.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mavit.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mavit.org.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mavit.org.uk header.i=@mavit.org.uk header.b="VA8VBdqB" Received: by mail-wm1-f68.google.com with SMTP id 5b1f17b1804b1-43948021a45so58192685e9.1 for ; Tue, 18 Feb 2025 07:31:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mavit.org.uk; s=google; t=1739892664; x=1740497464; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=P+GJNV9LdvaRHgPwaWUAij7MYLRlFZ7EH2pvr05khus=; b=VA8VBdqB6yf+ONcRCY44KKaS/KXq3EpL7gJnTNwj2TbuUAH39vj0Fgn9ihiEqX6IT2 X2C2qkR5GJpJhfH5IoQizDFw6iDuPD2hovYqukR5aoWYc8cE5ej1IED+JwLz8Mfgk49a h838SXdeQQKDKke+wLCaMjJnzErT0TxllXQ/A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739892664; x=1740497464; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=P+GJNV9LdvaRHgPwaWUAij7MYLRlFZ7EH2pvr05khus=; b=rfpFs8eKnDb/61AN9R+q+xyyw3+WZv6X1WhKjbMeQOgl5WcCdVcG1CRsDqiqz/8SWE N1PDY4wQm1nt78ayb+UWKq+Uc5eJXae5lJAfe1vF59iqvJPqc0CFDyS9g6KqtQsXKxh8 ImSdqc97fpoU1pElBOnxS/c/3Am6TPKTeB128/nMABaqniLQKfa5rgiXbz6B44CPCTDW O7DrS0yysM9apV/dMBLqqHSLY/Z2bcaZX9++N3mvIdM5sUHmDyckK3Litao+MkWrQ/5E 14jIgasjFTzbPAG1FkMN2RmA1hgD8dEWa6tUPuXDiWC6A3Ydu6T2rvWPdyAkkOb6wmhI 4yoA== X-Forwarded-Encrypted: i=1; AJvYcCV8lruFfcSPKv46C5lZfy9eCKEAa1bUtdPjBrKvsg7qXNsqox6B82LH/aLXVh6y420OjNg=@vger.kernel.org X-Gm-Message-State: AOJu0YzRaLE8Py7ct4tk7dsmv4ZstBKzjVM42HbSN8wrNabr9mFwDVhR y+sNwAF82epMXZUHF/s5kbd0teP7mCK96IDl88BXD3V0PC78LOJxC7MKdl0gQBgOQREJCB0vnwP +YPfBkZ0= X-Gm-Gg: ASbGnctCcSkuUHnzoBdkof8f1YT1YiPu14Dm25jrhwYQijHcx2HTnbSAAKk751F65JA HbruOHukoTOFQyJsFYce3DjEiUxUw56glFYiHqqDDngkYQd1XotWJUX3FklnxeZeUxZziwjybVk NxpGJ6Iqo0uQU8mQCNpRZblYAO3Sca+W0G9b5taGamZ0y7wXY6W3+OawgQ++R+ldLp/gQwcxqre rmTtgQXtxg/eKv3WXYwtheLaRSF2LZy86jKFUDcEFazlXNEYyAgPrRoAdhHt4O9JA80jgdokRix 4d8lWoR8jaYFNg+xU0/Boa37KXCEn7vJZOXXguYqlq97lY2BownHFY2WmZvDurFP2o1wJg4IoEc /Kmuvi+34JnBlpR3/g8U= X-Google-Smtp-Source: AGHT+IFWnhEggEymln70sV06CsmDWOLYLIDFhR/f2jtyKllX3dFFAE4Z24/IGmDmdLvke/SUPofDiw== X-Received: by 2002:a5d:6d8c:0:b0:38f:394f:d8c with SMTP id ffacd0b85a97d-38f394f9cc5mr11683026f8f.33.1739892664140; Tue, 18 Feb 2025 07:31:04 -0800 (PST) Received: from froglet.home.mavit.org.uk (dudl-14-b2-v4wan-165812-cust3365.vm31.cable.virginm.net. [82.34.125.38]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f259f8217sm15531774f8f.90.2025.02.18.07.31.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 07:31:03 -0800 (PST) Sender: Peter Oliver From: Peter Oliver X-Google-Original-From: Peter Oliver Received: from froglet.home.mavit.org.uk (localhost [127.0.0.1]) by froglet.home.mavit.org.uk (8.18.1/8.17.1) with ESMTPS id 51IFV2WS063564 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 18 Feb 2025 15:31:02 GMT Received: (from mavit@localhost) by froglet.home.mavit.org.uk (8.18.1/8.18.1/Submit) id 51IFV2PL063563; Tue, 18 Feb 2025 15:31:02 GMT To: gitster@pobox.com Cc: ps@pks.im, git@vger.kernel.org, Peter Oliver Subject: [PATCH v3 2/2] meson: fix Perl version check for Meson versions before 1.7.0 Date: Tue, 18 Feb 2025 15:30:43 +0000 Message-ID: <20250218153043.63535-3-git@mavit.org.uk> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250218153043.63535-1-git@mavit.org.uk> References: <20250218153043.63535-1-git@mavit.org.uk> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Command `perl --version` says, e.g., “This is perl 5, version 26, subversion 0 (v5.26.0)”, which older versions of Meson interpret as version 26. This will be fixed in Meson 1.7.0, but at the time of writing that isn’t yet released. If we run `perl -V:version` we get the unambiguous response “version='5.26.0';”, but we need at least Meson 1.5.0 to be able to do that. Note that Perl are seriously considering dropping the leading 5 entirely in the near future (https://perl.github.io/PPCs/ppc0025-perl-version/), but that shouldn’t affect us. Signed-off-by: Peter Oliver Co-authored-by: Patrick Steinhardt --- meson.build | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f01d81b39f..fd19d348c6 100644 --- a/meson.build +++ b/meson.build @@ -755,7 +755,22 @@ endif # Note that we only set NO_PERL if the Perl features were disabled by the user. # It may not be set when we have found Perl, but only use it to run tests. -perl = find_program('perl', version: '>=5.26.0', dirs: program_path, required: perl_required) +# +# At the time of writing, executing `perl --version` results in a string +# similar to the following output: +# +# This is perl 5, version 40, subversion 0 (v5.40.0) built for x86_64-linux-thread-multi +# +# Meson picks up the "40" as version number instead of using "v5.40.0" +# due to the regular expression it uses. This got fixed in Meson 1.7.0, +# but meanwhile we have to either use `-V:version` instead of `--version`, +# 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') +else + perl = find_program('perl', dirs: program_path, required: perl_required, version: '>=26') +endif perl_features_enabled = perl.found() and get_option('perl').allowed() if perl_features_enabled build_options_config.set('NO_PERL', '')