[Bug build/31385] New: sort-makefile-lines.py doesn't check variable with _

[Bug build/31385] New: sort-makefile-lines.py doesn't check variable with _

[hjl.tools at gmail dot com]

https://sourceware.org/bugzilla/show_bug.cgi?id=31385

            Bug ID: 31385
           Summary: sort-makefile-lines.py doesn't check variable with _
           Product: glibc
           Version: 2.40
            Status: NEW
          Severity: normal
          Priority: P2
         Component: build
          Assignee: unassigned at sourceware dot org
          Reporter: hjl.tools at gmail dot com
                CC: carlos at redhat dot com
  Target Milestone: ---

There are many Makefile variable names with _:

sysdeps/aarch64/Makefile:sysdep_headers += sys/ifunc.h
sysdeps/aarch64/Makefile:sysdep_routines += \
sysdeps/aarch64/Makefile:sysdep_malloc_debug_routines = __mtag_tag_zero_region
__mtag_tag_region
...

But sort-makefile-lines.py doesn't include _ in

    # Build a list of all start markers (tuple includes name).
    startmarks = []
    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])

-- 
You are receiving this mail because:
You are on the CC list for the bug.

[Bug build/31385] sort-makefile-lines.py doesn't check variable with _

[hjl.tools at gmail dot com]

https://sourceware.org/bugzilla/show_bug.cgi?id=31385

--- Comment #1 from H.J. Lu <hjl.tools at gmail dot com> ---
Also many Makefiles have

sysdep_routines += \
  strcasecmp_l-nonascii \
  strcspn-generic \
  strncase_l-nonascii \
  strpbrk-generic \
  strspn-generic \
  varshift \
# sysdep_routines

But sort-makefile-lines.py expects

  # sysdep_routines

-- 
You are receiving this mail because:
You are on the CC list for the bug.

[Bug build/31385] sort-makefile-lines.py doesn't check variable with _ nor with "^# variable"

[hjl.tools at gmail dot com]

https://sourceware.org/bugzilla/show_bug.cgi?id=31385

H.J. Lu <hjl.tools at gmail dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|sort-makefile-lines.py      |sort-makefile-lines.py
                   |doesn't check variable with |doesn't check variable with
                   |_                           |_ nor with "^# variable"

-- 
You are receiving this mail because:
You are on the CC list for the bug.

[Bug build/31385] sort-makefile-lines.py doesn't check variable with _ nor with "^# variable"

[cvs-commit at gcc dot gnu.org]

https://sourceware.org/bugzilla/show_bug.cgi?id=31385

--- Comment #2 from Sourceware Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by H.J. Lu <hjl@sourceware.org>:

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6a2512bf1605a4208dd94ef67408488d8acb2409

commit 6a2512bf1605a4208dd94ef67408488d8acb2409
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Feb 15 03:22:55 2024 -0800

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

    '_' 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.

-- 
You are receiving this mail because:
You are on the CC list for the bug.

[Bug build/31385] sort-makefile-lines.py doesn't check variable with _ nor with "^# variable"

[hjl.tools at gmail dot com]

https://sourceware.org/bugzilla/show_bug.cgi?id=31385

H.J. Lu <hjl.tools at gmail dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|---                         |2.40
             Status|NEW                         |RESOLVED
         Resolution|---                         |FIXED

--- Comment #3 from H.J. Lu <hjl.tools at gmail dot com> ---
Fixed.

-- 
You are receiving this mail because:
You are on the CC list for the bug.