build: minor cleanups to native_clang package #24326

fanquake commented at 8:42 AM on February 12, 2022: member

Pulled out of #21778.

Guix build:

bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
b7fc20b23d2270f0bf39859fc2d9b75c687a0cceaf287b3871d872e8e7aaaeb6  guix-build-4255b4669359/output/arm64-apple-darwin/SHA256SUMS.part
bd31487de1f49fd84b1eb37c744ea55b1268d729ec4715e7cb50a768b147628e  guix-build-4255b4669359/output/arm64-apple-darwin/bitcoin-4255b4669359-arm64-apple-darwin.tar.gz
6eca741ecd7e35e5d917442326e8f64e2f745cb0cf8573e616fb1fc388d3376f  guix-build-4255b4669359/output/arm64-apple-darwin/bitcoin-4255b4669359-osx-unsigned.dmg
b54797d350e00a597478dadb3c7372d15306c095f63cc3e5257a3b1851856614  guix-build-4255b4669359/output/arm64-apple-darwin/bitcoin-4255b4669359-osx-unsigned.tar.gz
af212f87138950a398e2cd1c3ebc69bbe90126ac916a735d5a24a91864e0a164  guix-build-4255b4669359/output/dist-archive/bitcoin-4255b4669359.tar.gz
d25ab8698524f283958e32cbdfaa14d344d905f972c66987ff27286cb2abcdfa  guix-build-4255b4669359/output/x86_64-apple-darwin/SHA256SUMS.part
39f069317efff319aea55d6f929ee4cd5e4c04cfb5cf84ea1e6500b18e368be3  guix-build-4255b4669359/output/x86_64-apple-darwin/bitcoin-4255b4669359-osx-unsigned.dmg
dc755eff3cb4e628637f68c3e31a28ae41bbece1339067a2c0042f39899a275c  guix-build-4255b4669359/output/x86_64-apple-darwin/bitcoin-4255b4669359-osx-unsigned.tar.gz
d084f798f08cb175272ae420a68df3fa69c3b2be2fbe972c929dd4d4214039f7  guix-build-4255b4669359/output/x86_64-apple-darwin/bitcoin-4255b4669359-osx64.tar.gz

fanquake added the label Build system on Feb 12, 2022

fanquake added the label DrahtBot Guix build requested on Feb 12, 2022

hebasto commented at 6:56 PM on February 12, 2022: member

Motivation for dropping cp command -P and -f options (second and third commits) still unclear to me. Do they hurt?

DrahtBot commented at 5:38 AM on February 13, 2022: member

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

#21778 (build: LLVM 14 & LLD based macOS toolchain 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.

DrahtBot commented at 10:41 PM on February 13, 2022: member

Guix builds

File	commit 3bb93940703e9d0f4bffda98f4fe22fb1487db34<br>(master)	commit 72da61ee6ba842fa085b406d00bc5383dbe1aa23<br>(master and this pull)
SHA256SUMS.part	`dd60a2a6ddc05117...`	`dc9819732dd6f3ce...`
*-aarch64-linux-gnu-debug.tar.gz	`8bc5bcfefab76715...`	`026d68c9c96e8538...`
*-aarch64-linux-gnu.tar.gz	`710321dcf5f0a4e9...`	`961295828a23945f...`
*-arm-linux-gnueabihf-debug.tar.gz	`d0b5b74e80a06c13...`	`b4f6b40e3c78be9e...`
*-arm-linux-gnueabihf.tar.gz	`7540ec432bbe611b...`	`6c3d25e3f87e434f...`
*-arm64-apple-darwin.tar.gz	`20bd3de56c122dab...`	`dd1269b48621afd6...`
*-osx-unsigned.dmg	`238a67aa27f7ed54...`	`2bc74f16b79fe3e1...`
*-osx-unsigned.tar.gz	`ab189b2d1873f62f...`	`9b0e1064cf58c98e...`
*-osx64.tar.gz	`c25bd3526668fd5b...`	`b7a257d894c2e63c...`
*-powerpc64-linux-gnu-debug.tar.gz	`d8f9c7a39538f196...`	`3966d5d260b6e248...`
*-powerpc64-linux-gnu.tar.gz	`751c0e3f4371b425...`	`fdc7002432ab0721...`
*-powerpc64le-linux-gnu-debug.tar.gz	`0b3a07e161da8e65...`	`d7c0dd9250512f8e...`
*-powerpc64le-linux-gnu.tar.gz	`df8899cbe9059ccd...`	`c0b791647ba6a79f...`
*-riscv64-linux-gnu-debug.tar.gz	`0cb9b3fe2626bac2...`	`ca246bfa5a66b77a...`
*-riscv64-linux-gnu.tar.gz	`08296f18f18113e9...`	`814fd2ee294fa392...`
*-x86_64-linux-gnu-debug.tar.gz	`41ecc738e3c92499...`	`c582d69e695950dc...`
*-x86_64-linux-gnu.tar.gz	`9e1179bfc7d06e08...`	`4087d6869551730c...`
*.tar.gz	`b7698539ff204a66...`	`070c29c9f4d9671c...`
guix_build.log	`a288ed44440d4dfb...`	`ad0953479a2c1d22...`
guix_build.log.diff		`5dc2bd74fc18468b...`

DrahtBot removed the label DrahtBot Guix build requested on Feb 13, 2022

in depends/packages/native_clang.mk:20 in 7981b62a29 outdated

  15 | @@ -16,15 +16,10 @@ endef
  16 |  define $(package)_stage_cmds
  17 |    mkdir -p $($(package)_staging_prefix_dir)/lib/clang/$($(package)_version)/include && \
  18 |    mkdir -p $($(package)_staging_prefix_dir)/bin && \
  19 | -  mkdir -p $($(package)_staging_prefix_dir)/include && \
  20 |    cp bin/clang $($(package)_staging_prefix_dir)/bin/ && \
  21 | -  cp -P bin/clang++ $($(package)_staging_prefix_dir)/bin/ && \
  22 | +  cp bin/clang++ $($(package)_staging_prefix_dir)/bin/ && \

hebasto commented at 12:30 PM on February 14, 2022:

I lean to avoid this change, which makes clang++ binary a copy of clang binary, rather than a symbolic link to the latter. AFAIK, clang++ being a symlink to clang is a status quo around all cases I have ever saw and used.

fanquake commented at 2:00 PM on February 14, 2022:

Dropped this for now.

hebasto commented at 12:30 PM on February 14, 2022: member

Approach ACK 7981b62a294e41c97cb1860dd6968b3fa4e554ee.

build: remove unused include dir from clang package dbcaba835d

build: remove -f from clang cp invocation 4255b46693

fanquake force-pushed on Feb 14, 2022

hebasto approved

hebasto commented at 2:04 PM on February 14, 2022: member

ACK 4255b46693591ab930cc3c7f992ccfb6f250db8c

hebasto commented at 3:47 PM on February 14, 2022: member

Guix builds:

$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
b7fc20b23d2270f0bf39859fc2d9b75c687a0cceaf287b3871d872e8e7aaaeb6  guix-build-4255b4669359/output/arm64-apple-darwin/SHA256SUMS.part
bd31487de1f49fd84b1eb37c744ea55b1268d729ec4715e7cb50a768b147628e  guix-build-4255b4669359/output/arm64-apple-darwin/bitcoin-4255b4669359-arm64-apple-darwin.tar.gz
6eca741ecd7e35e5d917442326e8f64e2f745cb0cf8573e616fb1fc388d3376f  guix-build-4255b4669359/output/arm64-apple-darwin/bitcoin-4255b4669359-osx-unsigned.dmg
b54797d350e00a597478dadb3c7372d15306c095f63cc3e5257a3b1851856614  guix-build-4255b4669359/output/arm64-apple-darwin/bitcoin-4255b4669359-osx-unsigned.tar.gz
af212f87138950a398e2cd1c3ebc69bbe90126ac916a735d5a24a91864e0a164  guix-build-4255b4669359/output/dist-archive/bitcoin-4255b4669359.tar.gz
d25ab8698524f283958e32cbdfaa14d344d905f972c66987ff27286cb2abcdfa  guix-build-4255b4669359/output/x86_64-apple-darwin/SHA256SUMS.part
39f069317efff319aea55d6f929ee4cd5e4c04cfb5cf84ea1e6500b18e368be3  guix-build-4255b4669359/output/x86_64-apple-darwin/bitcoin-4255b4669359-osx-unsigned.dmg
dc755eff3cb4e628637f68c3e31a28ae41bbece1339067a2c0042f39899a275c  guix-build-4255b4669359/output/x86_64-apple-darwin/bitcoin-4255b4669359-osx-unsigned.tar.gz
d084f798f08cb175272ae420a68df3fa69c3b2be2fbe972c929dd4d4214039f7  guix-build-4255b4669359/output/x86_64-apple-darwin/bitcoin-4255b4669359-osx64.tar.gz

hebasto commented at 3:48 PM on February 14, 2022: member

Guix builds hashes in the PR description look outdated.

fanquake commented at 4:21 PM on February 14, 2022: member

Guix builds hashes in the PR description look outdated.

Hashes have been updated.

fanquake merged this on Feb 14, 2022

fanquake closed this on Feb 14, 2022

fanquake deleted the branch on Feb 14, 2022

sidhujag referenced this in commit 82740f8612 on Feb 15, 2022

PastaPastaPasta referenced this in commit f344e9fc65 on Apr 7, 2022

PastaPastaPasta referenced this in commit 9fb3edaae7 on Apr 11, 2022

gades referenced this in commit abe009083d on May 8, 2022

DrahtBot locked this on Feb 14, 2023