From patchwork Wed Jan 31 04:02:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangrui Song X-Patchwork-Id: 85063 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 22F8A3858407 for ; Wed, 31 Jan 2024 04:02:31 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by sourceware.org (Postfix) with ESMTPS id C35DA3858D1E for ; Wed, 31 Jan 2024 04:02:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C35DA3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=flex--maskray.bounces.google.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C35DA3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::b49 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706673730; cv=none; b=nJ5inh9VXu4trfYAGLdVBE0mlZZpgpq94QZzV6pJgLumEtc12wl7NbUzwuucgYYAJjFmOreAUTObwImCvTRZFmje8lF2yHDR7KO25HrJLCSCaRVMkEzyuAzB44faqlJxk2LKKQcH7L/aZdAXK4xJ1CPrbsWz0YtoKIeYwyGHros= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706673730; c=relaxed/simple; bh=pEUgnrbIeBLnKUfMPIF83oc6e2EXLVK1qBakhmzffD8=; h=DKIM-Signature:Date:Mime-Version:Message-ID:Subject:From:To; b=vAkTucZ6CXGa4C6kHaito4pia/h73Rd/biF3NXDIkC8qGeWzCoJLg3rsENzBQ1SWLctqsguxt1p9bwBKqq44kr78W3OCoVi+3WT+LlQdcjOlQDZ19YJAR6NBqn3YVaiGuZBQX2Zp34M6GcEFMVRmXMX/Is4eGPSZx6/ISSnBcVs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-dc6b2681571so1019263276.2 for ; Tue, 30 Jan 2024 20:02:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706673727; x=1707278527; darn=sourceware.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=hQjdlH6JvEFj/ESDlIMbLdNwqkD9girDHZPaTJ/BNcE=; b=dREF1kIVyOTgB8rRIPJ4GguhneADfnNxSrLUHfsXspBfU4ze2BSrSBP0on6XJMG/9P ptohzOVMEVy8eywsjsDd9wrO97uXBgHQAuVloCe+DCy4LhElqbJ3dUTjFiCOUtd3ve1x CYTxqsJsSK8m9cfAvRbFs+1Xxhf8+r5H0zTwtyNCtzjZI/DSsDB3bBX+qdZ4xQfQ3co1 cVDfR39T5fQsFau/4qmVnkU/o4Lqfdl7b242xcPJbrwm9+2xcI2/mcrM8QhcoeWyTo/x aBkieon166ZauN+lzwz66q/50GPYa6WybLHXYStbsnvo/6q//00jH9cFaJsP74G2NmVq AJiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706673727; x=1707278527; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=hQjdlH6JvEFj/ESDlIMbLdNwqkD9girDHZPaTJ/BNcE=; b=arJET4pXKKjiJYFCKF9fprgTFL8RcBnjW0f2uZgZHe4UypW10vl6sS3eY5Qz5iXWgF JeFaiF1mMn1bEDTTdIqj7hHbSdFATlijeG772SAzrtIFslr6i0F55RTRIWfg1WVo0QER INUU7piWUV7RbzBmXarkuMALmkmxrJBYz5wKFjsXPA9v4kaLqyvB392AepiWpmpw4pq9 O8x2YLeKtAvag118oF9amUGQap8aAo7U1JP0CUOxVEqkrIPs4hYrn+Z2wJDx2hwkbXAu xQ8/O7sw6rXDzTbCtzKAmeVhnuzqe2oeIA9L3b+h5DLfni5qhYAugbTLW/lMqYR6e42m FV8Q== X-Gm-Message-State: AOJu0YyPzZ/h5m4FlrxxSi9PbJWuiIoBtqNR0zu2mz8uj9QPDEEk38fm Ewi67psouzR0GYIjuABht1YLbpEbYuqx8MA5J36foL/RqDsqA2DnH6xBp68ogXZCnKd4SZg2YSF xD5bwJg== X-Google-Smtp-Source: AGHT+IEiS6aliJjQ5podLkd4Gtm17iWR+yVo+eTRFOBcWX71cEyM3Ab2vhGUNqhbfIzXcXbpDHAb9tbPFFSF X-Received: from maskray.svl.corp.google.com ([2620:15c:2d3:205:bc85:d604:bdab:a3ed]) (user=maskray job=sendgmr) by 2002:a05:6902:1188:b0:dbe:d0a9:2be8 with SMTP id m8-20020a056902118800b00dbed0a92be8mr29812ybu.0.1706673727140; Tue, 30 Jan 2024 20:02:07 -0800 (PST) Date: Tue, 30 Jan 2024 20:02:01 -0800 Mime-Version: 1.0 Message-ID: <20240131040201.470671-1-maskray@google.com> Subject: [PATCH] build-many-glibcs: relax version check to allow non-digit characters From: Fangrui Song To: DJ Delorie , Lukasz Majewski , Adhemerval Zanella Netto Cc: libc-alpha@sourceware.org, Fangrui Song X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org A version string may contain non-digit characters, commonly found in built-from-VCS tools, e.g. ``` git version 2.39.GIT git version 2.43.0.493.gbc7ee2e5e1 ``` `int()` will raise a ValueError, leading to a spurious 'missing'. Reviewed-by: DJ Delorie --- scripts/build-many-glibcs.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py index 784c80d132..84418e8de1 100755 --- a/scripts/build-many-glibcs.py +++ b/scripts/build-many-glibcs.py @@ -1888,7 +1888,7 @@ def get_parser(): return parser -def get_version_common(progname,line,word,delchars,arg1): +def get_version_common(progname,line,word,arg1): try: out = subprocess.run([progname, arg1], stdout=subprocess.PIPE, @@ -1896,13 +1896,12 @@ def get_version_common(progname,line,word,delchars,arg1): stdin=subprocess.DEVNULL, check=True, universal_newlines=True) v = out.stdout.splitlines()[line].split()[word] - if delchars: - v = v.replace(delchars,'') + v = re.match(r'[0-9]+(.[0-9]+)*', v).group() return [int(x) for x in v.split('.')] except: return 'missing'; -def get_version_common_stderr(progname,line,word,delchars,arg1): +def get_version_common_stderr(progname,line,word,arg1): try: out = subprocess.run([progname, arg1], stdout=subprocess.DEVNULL, @@ -1910,20 +1909,19 @@ def get_version_common_stderr(progname,line,word,delchars,arg1): stdin=subprocess.DEVNULL, check=True, universal_newlines=True) v = out.stderr.splitlines()[line].split()[word] - if delchars: - v = v.replace(delchars,'') + v = re.match(r'[0-9]+(.[0-9]+)*', v).group() return [int(x) for x in v.split('.')] except: return 'missing'; def get_version(progname): - return get_version_common (progname, 0, -1, None, '--version'); + return get_version_common(progname, 0, -1, '--version'); def get_version_awk(progname): - return get_version_common (progname, 0, 2, ',', '--version'); + return get_version_common(progname, 0, 2, '--version'); def get_version_bzip2(progname): - return get_version_common_stderr (progname, 0, 6, ',', '-h'); + return get_version_common_stderr(progname, 0, 6, '-h'); def check_version(ver, req): for v, r in zip(ver, req):