From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 3A8BE38582A4 for ; Mon, 11 Mar 2024 19:03:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3A8BE38582A4 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3A8BE38582A4 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710183829; cv=none; b=OChAdtsmbaQ8ZGfGkBs1SvoCKFRDlKtvHhNJAVRFi5FdL7mhpUvpXUfOuU0WEvf9q+2LTTXQaNSiBgR+klYwgJQtWEa9LJtMfwRfmSfr6CaNFMjuOXbXao3L8sOW3giPrGrWLurzcQYZ+w79eFBdnixD7gzWBXO04wZCEWC0GlU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710183829; c=relaxed/simple; bh=5MoUoGyv1fZCNo8LfD6SWuwwPivgDgQzH7MOZ20/8GE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=rEbdgE7w/tmm24aShC68oDLdVHT2HlpUi859MurwSINnQq71dvyGmV/hkZCnDWdWXmbM8qcykFlBUoNVbPSU6lDC4jKT5yG/iEPriLB8aRT2OYHe6PbQKO599CdHdexhB+RmZdCLWnRXsngQ30BdWoD4PGNuq6CNoo02Lp5nlA8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 468071E0FC; Mon, 11 Mar 2024 15:03:44 -0400 (EDT) From: Simon Marchi To: buildbot@sourceware.org Cc: Simon Marchi Subject: [PATCH 5/8] autoregen.py: add non-suffixed version of the tools Date: Mon, 11 Mar 2024 15:01:17 -0400 Message-ID: <20240311190341.235331-6-simon.marchi@efficios.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240311190341.235331-1-simon.marchi@efficios.com> References: <20240311190341.235331-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3496.4 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_SOFTFAIL,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: My setup is that I have the appropriate versions of the autotools in /opt/autostuff/bin. They are not suffixed with their versions. To allow me to run the script locally, add non-suffixed names at the end of the possible names lists. --- builder/containers/autoregen.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py index e63436111246..6560077a406b 100755 --- a/builder/containers/autoregen.py +++ b/builder/containers/autoregen.py @@ -8,10 +8,10 @@ from pathlib import Path # On Gentoo, vanilla unpatched autotools are packaged separately. # We place the vanilla names first as we want to prefer those if both exist. -AUTOCONF_NAMES = ["autoconf-vanilla-2.69", "autoconf-2.69"] -AUTOMAKE_NAMES = ["automake-vanilla-1.15", "automake-1.15.1"] -ACLOCAL_NAMES = ["aclocal-vanilla-1.15", "aclocal-1.15.1"] -AUTOHEADER_NAMES = ["autoheader-vanilla-2.69", "autoheader-2.69"] +AUTOCONF_NAMES = ["autoconf-vanilla-2.69", "autoconf-2.69", "autoconf"] +AUTOMAKE_NAMES = ["automake-vanilla-1.15", "automake-1.15.1", "automake"] +ACLOCAL_NAMES = ["aclocal-vanilla-1.15", "aclocal-1.15.1", "aclocal"] +AUTOHEADER_NAMES = ["autoheader-vanilla-2.69", "autoheader-2.69", "autoheader"] # Pick the first for each list that exists on this system. AUTOCONF_BIN = next(name for name in AUTOCONF_NAMES if shutil.which(name)) @@ -23,8 +23,8 @@ AUTOHEADER_BIN = next(name for name in AUTOHEADER_NAMES if shutil.which(name)) # It's harmless to set it on other systems though. ENV = " ".join( ( - f'WANT_AUTOCONF={AUTOCONF_BIN.split("-", 1)[1]}', - f'WANT_AUTOMAKE={AUTOMAKE_BIN.split("-", 1)[1]}', + f'WANT_AUTOCONF={AUTOCONF_BIN.split("-", 1)[1] if "-" in AUTOCONF_BIN else ""}', + f'WANT_AUTOMAKE={AUTOMAKE_BIN.split("-", 1)[1] if "-" in AUTOMAKE_BIN else ""}', f"AUTOCONF={AUTOCONF_BIN}", f"ACLOCAL={ACLOCAL_BIN}", f"AUTOMAKE={AUTOMAKE_BIN}", -- 2.44.0