Skip to content

Conversation

@fanquake
Copy link
Member

NM is part of the current toolset, and can be set by the user. Include it in gen_id.

@DrahtBot
Copy link
Contributor

DrahtBot commented Jan 15, 2024

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

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK TheCharlatan

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

Copy link
Contributor

@sedited sedited left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK a1db512f069039530b9fb70f8c004a4f25c3e257

Guix build (x86)

@fanquake
Copy link
Member Author

@TheCharlatan note that you've ACK'd what I assume was the prior commit hash here

@sedited
Copy link
Contributor

sedited commented Jan 19, 2024

Yeah, also built on the wrong commit, so:
Re-ACK 6ec2813

Guix build (x86):

67d1d5dd27bc7b2df6b5d77265a9be0c5e3d7cf0bd003b8ec177010c18526814  guix-build-6ec2813cd88d/output/aarch64-linux-gnu/SHA256SUMS.part
59d2f605151251ee05e9c8b043ead799254c0b61da513df8ba4b9adb8c3dd619  guix-build-6ec2813cd88d/output/aarch64-linux-gnu/bitcoin-6ec2813cd88d-aarch64-linux-gnu-debug.tar.gz
d299e058786d3db9e145ea692b4e90b9ce8a60ec16d101e475e8b2927b53f5ac  guix-build-6ec2813cd88d/output/aarch64-linux-gnu/bitcoin-6ec2813cd88d-aarch64-linux-gnu.tar.gz
7732932c2364b7af2369e74e2ff9a0c27373f9e609e1a88f78869637bbccbf60  guix-build-6ec2813cd88d/output/arm-linux-gnueabihf/SHA256SUMS.part
a6bc02461cb6cfe3d96741ec883964fc635dcef5f1ffd47267410984b38ce322  guix-build-6ec2813cd88d/output/arm-linux-gnueabihf/bitcoin-6ec2813cd88d-arm-linux-gnueabihf-debug.tar.gz
4ff7e341fa221bb60de07f8e2e4e45fd4a5fb700c0fd7ce86c7bff49a9b6b37b  guix-build-6ec2813cd88d/output/arm-linux-gnueabihf/bitcoin-6ec2813cd88d-arm-linux-gnueabihf.tar.gz
d78f309152100991c760beac25a71bae13f4a0a4706effc95d09c9470d48ab0e  guix-build-6ec2813cd88d/output/arm64-apple-darwin/SHA256SUMS.part
1386028dff7e8edee95edf11eaf28af6ee628e9aad4a270a67b5c6de8f500318  guix-build-6ec2813cd88d/output/arm64-apple-darwin/bitcoin-6ec2813cd88d-arm64-apple-darwin-unsigned.tar.gz
24e0fe6a1b61487960176da134f7559bbebf9ef868dd3f4a638c703692175ae5  guix-build-6ec2813cd88d/output/arm64-apple-darwin/bitcoin-6ec2813cd88d-arm64-apple-darwin-unsigned.zip
0611092f5ba21b59e246743b6d74c6438ecfe95fd2049d2048459bf59a6896db  guix-build-6ec2813cd88d/output/arm64-apple-darwin/bitcoin-6ec2813cd88d-arm64-apple-darwin.tar.gz
2662fe43573c1c7870bbc59be5b1358a9dc3513664b75f413fe70ca5eba4bbe1  guix-build-6ec2813cd88d/output/dist-archive/bitcoin-6ec2813cd88d.tar.gz
500c979ef50be80750cf85517c86d8db434d388620a5dc4d39f3b3b90afc2224  guix-build-6ec2813cd88d/output/powerpc64-linux-gnu/SHA256SUMS.part
e320f8b7daf2a90fd21bc6f6607cbdfbcada2a045a3fa22acea37e5502d89faf  guix-build-6ec2813cd88d/output/powerpc64-linux-gnu/bitcoin-6ec2813cd88d-powerpc64-linux-gnu-debug.tar.gz
fcdc263f9fb29dd9a468e999968bd799c65ecd04380ce4490647259478ec3cb2  guix-build-6ec2813cd88d/output/powerpc64-linux-gnu/bitcoin-6ec2813cd88d-powerpc64-linux-gnu.tar.gz
a3003fb4916ee2e422d3dec2ec9999fcb60e227554da1c23e9ac3995e8dbafa6  guix-build-6ec2813cd88d/output/powerpc64le-linux-gnu/SHA256SUMS.part
f19c30d6a8e1c3bc29a880ee55fdfc0ee7fdacc1a97c823f00facffdadc1af72  guix-build-6ec2813cd88d/output/powerpc64le-linux-gnu/bitcoin-6ec2813cd88d-powerpc64le-linux-gnu-debug.tar.gz
f38767f7e1f8d0b9accd2e97882dea653564d2c93d657ab8d4bbf15bb150f93d  guix-build-6ec2813cd88d/output/powerpc64le-linux-gnu/bitcoin-6ec2813cd88d-powerpc64le-linux-gnu.tar.gz
6286b59f2810196ff3df8b0c9b542713b7e4c8d15578848f043baf8ccc8f9937  guix-build-6ec2813cd88d/output/riscv64-linux-gnu/SHA256SUMS.part
db222bb8c3df9d89212c3620d8f39780141fe9da8635781dec92a2dacad40ac1  guix-build-6ec2813cd88d/output/riscv64-linux-gnu/bitcoin-6ec2813cd88d-riscv64-linux-gnu-debug.tar.gz
cd9b5fbee646f3b559fad44c3e8f303f5f5850480b92d433ef9601cc057e5c36  guix-build-6ec2813cd88d/output/riscv64-linux-gnu/bitcoin-6ec2813cd88d-riscv64-linux-gnu.tar.gz
291a129b98175d70fa3594032edbfbae24f1a739dc7a066ecc7eeeeaa6076887  guix-build-6ec2813cd88d/output/x86_64-apple-darwin/SHA256SUMS.part
c176b4678eeb33d8800eab9418b6cd262336e72b5aceb41321f51a267dba19cd  guix-build-6ec2813cd88d/output/x86_64-apple-darwin/bitcoin-6ec2813cd88d-x86_64-apple-darwin-unsigned.tar.gz
d5f0b1428338c84782a69c095223b93772cf164c0351ae3b3224f0fe04f93df0  guix-build-6ec2813cd88d/output/x86_64-apple-darwin/bitcoin-6ec2813cd88d-x86_64-apple-darwin-unsigned.zip
6462706848e44c55abdbef86412c6923c3bb7b119139cad91a194d021212f9a0  guix-build-6ec2813cd88d/output/x86_64-apple-darwin/bitcoin-6ec2813cd88d-x86_64-apple-darwin.tar.gz
778c6d1eb7107cd63107305dd6b94573821b080a588e752b3d79c4451630d902  guix-build-6ec2813cd88d/output/x86_64-linux-gnu/SHA256SUMS.part
695dc665c3f03f157e09f8d130c2e172f7817edfed4f7e29c67b203d4ac69121  guix-build-6ec2813cd88d/output/x86_64-linux-gnu/bitcoin-6ec2813cd88d-x86_64-linux-gnu-debug.tar.gz
a04c8f8f5b66989f1d64742358bd52a9df9dc14e90fb24d73dcaaa7612b0d94c  guix-build-6ec2813cd88d/output/x86_64-linux-gnu/bitcoin-6ec2813cd88d-x86_64-linux-gnu.tar.gz
8d74794649c280ca3abd711ded1bfc8ce162f31a5157db543a677d43ab509467  guix-build-6ec2813cd88d/output/x86_64-w64-mingw32/SHA256SUMS.part
62a37721c29c21e007df3edd902a0bae71feec17ab47f8c90ea500f3d9105435  guix-build-6ec2813cd88d/output/x86_64-w64-mingw32/bitcoin-6ec2813cd88d-win64-debug.zip
ec51507636565deecd6f26270e6e8f83232b0b868a27e52e665bfb818ce76b94  guix-build-6ec2813cd88d/output/x86_64-w64-mingw32/bitcoin-6ec2813cd88d-win64-setup-unsigned.exe
b8383c3689da80fd9c7f3dd8b2f9d36be550c1cedd89e7f68f7b4f2357ffecf0  guix-build-6ec2813cd88d/output/x86_64-w64-mingw32/bitcoin-6ec2813cd88d-win64-unsigned.tar.gz
0d5e8d6a5827b318471986eb1de839fd9baf9610ff11a1c50eb29ab59b1bf06f  guix-build-6ec2813cd88d/output/x86_64-w64-mingw32/bitcoin-6ec2813cd88d-win64.zip

@fanquake fanquake merged commit 0375244 into bitcoin:master Jan 19, 2024
@fanquake fanquake deleted the nm_gen_id branch January 19, 2024 13:17
Retropex pushed a commit to Retropex/bitcoin that referenced this pull request Mar 28, 2024
fanquake added a commit that referenced this pull request Jan 10, 2025
8a46286 depends: Fix spacing issue (Hennadii Stepanov)

Pull request description:

  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:
  ```diff
  @@ -110,50 +110,18 @@
   CXX_STANDARD=c++20
   END CXX
   BEGIN AR
  -ar: invalid option -- '='
  -Usage: ar [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file...
  -       ar -M [<mri-script]
  - commands:
  -  d            - delete file(s) from the archive
  -  m[ab]        - move file(s) in the archive
  -  p            - print file(s) found in the archive
  -  q[f]         - quick append file(s) to the archive
  -  r[ab][f][u]  - replace existing or insert new file(s) into the archive
  -  s            - act as ranlib
  -  t[O][v]      - display contents of the archive
  -  x[o]         - extract file(s) from the archive
  - command specific modifiers:
  -  [a]          - put file(s) after [member-name]
  -  [b]          - put file(s) before [member-name] (same as [i])
  -  [D]          - use zero for timestamps and uids/gids (default)
  -  [U]          - use actual timestamps and uids/gids
  -  [N]          - use instance [count] of name
  -  [f]          - truncate inserted file names
  -  [P]          - use full path names when matching
  -  [o]          - preserve original dates
  -  [O]          - display offsets of files in the archive
  -  [u]          - only replace files that are newer than current archive contents
  - generic modifiers:
  -  [c]          - do not warn if the library had to be created
  -  [s]          - create an archive index (cf. ranlib)
  -  [l <text> ]  - specify the dependencies of this library
  -  [S]          - do not build a symbol table
  -  [T]          - deprecated, use --thin instead
  -  [v]          - be verbose
  -  [V]          - display the version number
  -  @<file>      - read options from <file>
  -  --target=BFDNAME - specify the target object format as BFDNAME
  -  --output=DIRNAME - specify the output directory for extraction operations
  -  --record-libdeps=<text> - specify the dependencies of this library
  -  --thin       - make a thin archive
  - optional:
  -  --plugin <p> - load the specified plugin
  - emulation options:
  -  No emulation specific options
  -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
  +GNU ar (GNU Binutils for Ubuntu) 2.42
  +Copyright (C) 2024 Free Software Foundation, Inc.
  +This program is free software; you may redistribute it under the terms of
  +the GNU General Public License version 3 or (at your option) any later version.
  +This program has absolutely no warranty.
   END AR
   BEGIN NM
  -bash: line 1: --version: command not found
  +GNU nm (GNU Binutils for Ubuntu) 2.42
  +Copyright (C) 2024 Free Software Foundation, Inc.
  +This program is free software; you may redistribute it under the terms of
  +the GNU General Public License version 3 or (at your option) any later version.
  +This program has absolutely no warranty.
   END NM
   BEGIN RANLIB
   GNU ranlib (GNU Binutils for Ubuntu) 2.42
  @@ -321,5 +289,5 @@
   NO_HARDEN=
   END NO_HARDEN
   END ALL
  -build_id=b7effe2aa166e73f6d2587fb4805ea1cca4d3f1e5c3aae2cfd59c592816b05e3
  +build_id=4173a5f75182c792550652e621f6b4a68cc27c8909385580d4efc7bc7a769f51
   make: Leaving directory '/home/hebasto/git/bitcoin/depends'
  ```

  It was accidentally introduced in #29249.

ACKs for top commit:
  theuni:
    Nice catch. utACK 8a46286
  TheCharlatan:
    ACK 8a46286

Tree-SHA512: f50f3dea1f5fa545316743e61f69ad1a3b7de674604a560fd2a8d7095788cddfae4f88bee19eb2eed2e27800f94ec12bd8ee7e17d65f2a6839530d3646e5440d
@bitcoin bitcoin locked and limited conversation to collaborators Jan 18, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants