depends: Fix spacing issue #31627

pull hebasto wants to merge 1 commits into bitcoin:master from hebasto:250109-gen_id changing 1 files +1 −1
  1. hebasto commented at 1:42 pm on January 9, 2025: member

    This PR resolves an issue where a missing space caused the value of the build_AR variable to be concatenated with the “NM=” string. This resulted in subsequent calls to ${AR} and ${NM} failing.

    Here is a diff for the make -C depends print-build_id DEBUG=1 output:

     0@@ -110,50 +110,18 @@
     1 CXX_STANDARD=c++20
     2 END CXX
     3 BEGIN AR
     4-ar: invalid option -- '='
     5-Usage: ar [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file...
     6-       ar -M [<mri-script]
     7- commands:
     8-  d            - delete file(s) from the archive
     9-  m[ab]        - move file(s) in the archive
    10-  p            - print file(s) found in the archive
    11-  q[f]         - quick append file(s) to the archive
    12-  r[ab][f][u]  - replace existing or insert new file(s) into the archive
    13-  s            - act as ranlib
    14-  t[O][v]      - display contents of the archive
    15-  x[o]         - extract file(s) from the archive
    16- command specific modifiers:
    17-  [a]          - put file(s) after [member-name]
    18-  [b]          - put file(s) before [member-name] (same as [i])
    19-  [D]          - use zero for timestamps and uids/gids (default)
    20-  [U]          - use actual timestamps and uids/gids
    21-  [N]          - use instance [count] of name
    22-  [f]          - truncate inserted file names
    23-  [P]          - use full path names when matching
    24-  [o]          - preserve original dates
    25-  [O]          - display offsets of files in the archive
    26-  [u]          - only replace files that are newer than current archive contents
    27- generic modifiers:
    28-  [c]          - do not warn if the library had to be created
    29-  [s]          - create an archive index (cf. ranlib)
    30-  [l <text> ]  - specify the dependencies of this library
    31-  [S]          - do not build a symbol table
    32-  [T]          - deprecated, use --thin instead
    33-  [v]          - be verbose
    34-  [V]          - display the version number
    35-  @<file>      - read options from <file>
    36-  --target=BFDNAME - specify the target object format as BFDNAME
    37-  --output=DIRNAME - specify the output directory for extraction operations
    38-  --record-libdeps=<text> - specify the dependencies of this library
    39-  --thin       - make a thin archive
    40- optional:
    41-  --plugin <p> - load the specified plugin
    42- emulation options: 
    43-  No emulation specific options
    44-ar: supported targets: elf64-x86-64 elf32-i386 elf32-iamcu elf32-x86-64 pei-i386 pe-x86-64 pei-x86-64 elf64-little elf64-big elf32-little elf32-big elf64-littleaarch64 elf64-bigaarch64 elf32-littleaarch64 elf32-bigaarch64 elf32-littlearm elf32-bigarm pei-aarch64-little pe-aarch64-little elf64-alpha ecoff-littlealpha elf32-littlearm-fdpic elf32-bigarm-fdpic elf32-hppa-linux elf32-hppa elf64-ia64-little elf64-ia64-big pei-ia64 elf64-loongarch elf32-loongarch pei-loongarch64 elf32-m32r-linux elf32-m32rle-linux elf32-m68k elf32-tradbigmips elf32-tradlittlemips ecoff-bigmips ecoff-littlemips elf32-ntradbigmips elf64-tradbigmips elf32-ntradlittlemips elf64-tradlittlemips elf32-powerpc aixcoff-rs6000 elf32-powerpcle ppcboot elf64-powerpc elf64-powerpcle aixcoff64-rs6000 aix5coff64-rs6000 elf64-littleriscv elf32-littleriscv elf32-bigriscv elf64-bigriscv pei-riscv64-little elf32-s390 elf64-s390 elf32-sh-linux elf32-shbig-linux elf32-sh-fdpic elf32-shbig-fdpic elf32-sparc elf64-sparc pe-bigobj-x86-64 pe-i386 pdb srec symbolsrec verilog tekhex binary ihex plugin
    45+GNU ar (GNU Binutils for Ubuntu) 2.42
    46+Copyright (C) 2024 Free Software Foundation, Inc.
    47+This program is free software; you may redistribute it under the terms of
    48+the GNU General Public License version 3 or (at your option) any later version.
    49+This program has absolutely no warranty.
    50 END AR
    51 BEGIN NM
    52-bash: line 1: --version: command not found
    53+GNU nm (GNU Binutils for Ubuntu) 2.42
    54+Copyright (C) 2024 Free Software Foundation, Inc.
    55+This program is free software; you may redistribute it under the terms of
    56+the GNU General Public License version 3 or (at your option) any later version.
    57+This program has absolutely no warranty.
    58 END NM
    59 BEGIN RANLIB
    60 GNU ranlib (GNU Binutils for Ubuntu) 2.42
    61@@ -321,5 +289,5 @@
    62 NO_HARDEN=
    63 END NO_HARDEN
    64 END ALL
    65-build_id=b7effe2aa166e73f6d2587fb4805ea1cca4d3f1e5c3aae2cfd59c592816b05e3
    66+build_id=4173a5f75182c792550652e621f6b4a68cc27c8909385580d4efc7bc7a769f51
    67 make: Leaving directory '/home/hebasto/git/bitcoin/depends'
    

    It was accidentally introduced in #29249.

  2. depends: Fix spacing issue
    This change resolves an issue where a missing space caused the value of
    the `build_AR` variable to be concatenated with the "NM=" string. This
    resulted in subsequent calls to `${AR}` and `${NM}` failing.
    8a46286da6
  3. hebasto added the label Build system on Jan 9, 2025
  4. DrahtBot commented at 1:42 pm on January 9, 2025: contributor

    The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

    Code Coverage & Benchmarks

    For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/31627.

    Reviews

    See the guideline for information on the review process.

    Type Reviewers
    ACK theuni, TheCharlatan

    If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #31125 (depends: add *FLAGS to gen_id by fanquake)

    If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

  5. theuni approved
  6. theuni commented at 8:11 pm on January 9, 2025: member
    Nice catch. utACK 8a46286da667d19414c30350df48ebf245589e32
  7. TheCharlatan approved
  8. TheCharlatan commented at 8:37 pm on January 9, 2025: contributor
    ACK 8a46286da667d19414c30350df48ebf245589e32
  9. fanquake merged this on Jan 10, 2025
  10. fanquake closed this on Jan 10, 2025

  11. hebasto deleted the branch on Jan 10, 2025

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2025-01-21 03:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me