[PATCH v2] sort-makefile-lines.py: Allow '_' in name and "^# name"

[PATCH v2] sort-makefile-lines.py: Allow '_' in name and "^# name"

[H.J. Lu]

'_' 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/sort-makefile-lines.py b/scripts/sort-makefile-lines.py
index f65ee40e27..b2249aef6d 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)))
@@ -140,7 +140,7 @@ def sort_makefile_lines():
     rangemarks = []
     for sm in startmarks:
         # Look for things like "  # var" to end the sorted list.
-        reg = r'^  # ' + sm[1] + r'$'
+        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).
-- 
2.43.0

Re: [PATCH v2] sort-makefile-lines.py: Allow '_' in name and "^# name"

[Sunil Pandey]

[-- Attachment #1: Type: text/plain, Size: 1493 bytes --]

On Thu, Feb 15, 2024 at 4:29 AM H.J. Lu <hjl.tools@gmail.com> wrote:

> '_' 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 | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/sort-makefile-lines.py
> b/scripts/sort-makefile-lines.py
> index f65ee40e27..b2249aef6d 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)))
> @@ -140,7 +140,7 @@ def sort_makefile_lines():
>      rangemarks = []
>      for sm in startmarks:
>          # Look for things like "  # var" to end the sorted list.
> -        reg = r'^  # ' + sm[1] + r'$'
> +        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).
> --
> 2.43.0
>

LGTM

--Sunil

Re: [PATCH v2] sort-makefile-lines.py: Allow '_' in name and "^# name"

[H.J. Lu]

On Thu, Feb 15, 2024 at 9:28 AM Sunil Pandey <skpgkp2@gmail.com> wrote:
>
>
>
> On Thu, Feb 15, 2024 at 4:29 AM H.J. Lu <hjl.tools@gmail.com> wrote:
>>
>> '_' 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 | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/scripts/sort-makefile-lines.py b/scripts/sort-makefile-lines.py
>> index f65ee40e27..b2249aef6d 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)))
>> @@ -140,7 +140,7 @@ def sort_makefile_lines():
>>      rangemarks = []
>>      for sm in startmarks:
>>          # Look for things like "  # var" to end the sorted list.
>> -        reg = r'^  # ' + sm[1] + r'$'
>> +        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).
>> --
>> 2.43.0
>
>
> LGTM
>
> --Sunil

I checked it in.  I am pushing:

https://patchwork.sourceware.org/project/glibc/list/?series=30990

to update Makefiles.

-- 
H.J.