From patchwork Thu Feb 15 11:27:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1899283 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=cfJhWcIt; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TbCTl0PYrz23hm for ; Thu, 15 Feb 2024 22:27:39 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DDFB53861861 for ; Thu, 15 Feb 2024 11:27:36 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) by sourceware.org (Postfix) with ESMTPS id D82A13861861 for ; Thu, 15 Feb 2024 11:27:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D82A13861861 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D82A13861861 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::12f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707996443; cv=none; b=Ga0bfdHpKmwg8kj/unMUUSwhLs1VKbyQbveNVXSHaEGAuxTEFgpkMjHlrJvhMjhc8eVdZbUydn1EnaDtnSV4vfUZfKajZwsKrZeOjUuoA23elXnoA6tC+cfbqnhVAJCqfNSWaVqO9XuqrU7Ah3LiDbd4rDfO6sPVY1z9Ph9oKs0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707996443; c=relaxed/simple; bh=z2Nlfa/0C/bLxuRIAIxTtZhyjQE/NXs5dZsOAnWJiOc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=OelAeYAmnl4OdV2+uufIKDpNrTjRnOvjUZoBhm6USVYZh8V56CD7XNMgULMvtyIdOLLBpeJCFT/1h3MP1S7bks+W1d++imAa6qxNHYe/mkSm7HNU2c3+ODhTcM94K6uzXAzJEF52wsiSO9KzVvETXRFjqXXxGxOY1NVqKE/hBFA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x12f.google.com with SMTP id e9e14a558f8ab-363d85fda93so2356395ab.1 for ; Thu, 15 Feb 2024 03:27:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707996441; x=1708601241; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HkZbTEOskwEr4cYkQiMYzL14DcEnH10fR2nsCTw5tRM=; b=cfJhWcItJg3PKNMJcW47zdsi2JJfKzegQEErxLMg47hdGxBMWxieVi2r72lyiQ09aD uEk7qdqchAf/0Vbz40EMyaE5FgnXbmXEuSjY+K6QRwiv+EEwM0xUCyQ5GMbI58G62R7b 6gktC7qFNNL6f1X/5T3J5tBMbOS4Wq7H+gVhH+AGaYL6C8zKj20sMyBpycB6411IbCt7 Y3bUQk3R66l7u39iJpQA+FL0qGLh5xG4AsVKSuH7mEVoy/gHCkXxy4XwcYrjI/aO90CI EK0/BOunfkpZLNmFoFJO+w/nUYs+zBrzdhYuU4qkBxt/bKnMDudPxv3d+o6XXJ456hqZ ob8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707996441; x=1708601241; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HkZbTEOskwEr4cYkQiMYzL14DcEnH10fR2nsCTw5tRM=; b=M7aW7Ov8ayxPXZiZ0xo87LzZStYszx7L2fYVhVEdRpyFhFb79Z6ODfNa/rsWlzR/sI iNfZ0V69KQST8pFf5FfefKFgFyN2IdS4YDaNw74rbKF/AWAJmYMqijzTvVRQ5qa5zgIA ygykwlUa0xE21QJKCrDwlWGMTKu/e3pR0lX7QjgT4xfKByZwENPRqBtI90HrsPqoZGwc 1tt7yxyQqR/2ibMnFlpD9zJSSGpjSHSiLxinv71lOQjvSH6OpB9zE1conrpIZu+cNJ7k UTsO5cYT0ApqhxHOdbFNr7M1xK65+JgOnnhB2Ha4WrmBFuNSZCN6geZc2NQgPU3MmHla BN4w== X-Gm-Message-State: AOJu0YzDKok3RkIBbtpvH+vf2irgyqYx54VVDbAbdS44jACrRlC4CFkE Fo29uvXg0/fudAbFmZUP3yN3TDSTmuZPQjED2JwR/sPW2T0baemvEl7C1CUu X-Google-Smtp-Source: AGHT+IGY5/tJ+ScJTsyUvUPpU3S5nzf78Nz9rthe5duRNYe336W0uoBvCguRfk99t5mR2oMAfUlzfw== X-Received: by 2002:a05:6e02:788:b0:362:9250:df39 with SMTP id q8-20020a056e02078800b003629250df39mr1311396ils.21.1707996441006; Thu, 15 Feb 2024 03:27:21 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.58.89.72]) by smtp.gmail.com with ESMTPSA id s22-20020a63af56000000b005dc3407850dsm1088195pgo.87.2024.02.15.03.27.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 03:27:20 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id A864074005D; Thu, 15 Feb 2024 03:27:19 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: carlos@redhat.com Subject: [PATCH] sort-makefile-lines.py: Allow '_' in name and "^# name" Date: Thu, 15 Feb 2024 03:27:19 -0800 Message-ID: <20240215112719.392617-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3019.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_ABUSEAT, RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_PASS, 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 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+incoming=patchwork.ozlabs.org@sourceware.org '_' is used in Makefile variable names and many variables end with "^# name". Relax sort-makefile-lines.py to allow '_' in name and "^# name" as variable end. This fixes BZ #31385. --- scripts/sort-makefile-lines.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/sort-makefile-lines.py b/scripts/sort-makefile-lines.py index f65ee40e27..ea02412d67 100755 --- a/scripts/sort-makefile-lines.py +++ b/scripts/sort-makefile-lines.py @@ -129,7 +129,7 @@ def sort_makefile_lines(): for i in range(len(lines)): # Look for things like "var = \", "var := \" or "var += \" # to start the sorted list. - var = re.search(r'^([a-zA-Z0-9-]*) [\+:]?\= \\$', lines[i]) + var = re.search(r'^([a-zA-Z0-9-_]*) [\+:]?\= \\$', lines[i]) if var: # Remember the index and the name. startmarks.append((i, var.group(1))) @@ -139,8 +139,8 @@ def sort_makefile_lines(): # must have the matching comment name for it to be valid. rangemarks = [] for sm in startmarks: - # Look for things like " # var" to end the sorted list. - reg = r'^ # ' + sm[1] + r'$' + # Look for things like "^ *# var" to end the sorted list. + reg = r'^ *# ' + sm[1] + r'$' for j in range(sm[0] + 1, len(lines)): if re.search(reg, lines[j]): # Remember the block to sort (inclusive).