Skip to content

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Feb 6, 2022

boost package:

  • . is used as a separator in versions of other depends packages.

expat package:

  • reuse package version in its download path

The straightforward way to verify this PR:

$ cd depends
$ make clean-all
$ make boost_fetched
$ make expat_fetched

Copy link
Contributor

@prusnak prusnak left a comment

Choose a reason for hiding this comment

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

ACK edc9a6a

Tested that make expansions work as expected.

@DrahtBot
Copy link
Contributor

DrahtBot commented Feb 6, 2022

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #23340 (build: upgrade to boost 1.77 to fix c++20 compilation by PastaPastaPasta)

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.

Copy link
Contributor

@shaavan shaavan left a comment

Choose a reason for hiding this comment

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

ACK edc9a6a

The package version of boost is updated to the standard of displaying the package name. Other subsequent changes are made so that the package download path and file name remain unchanged.
The package version is also used correctly so that the download path of the expat remains unchanged.

I used the set of commands mentioned in the PR description to test this PR. The following screenshot compares Master's and PR's results, showing no visible differences.

Screenshot:

Master PR
Master PR

p.s.: The warning problem while running make expat_fetched on the PR branch seems unrelated to this PR.

@hebasto
Copy link
Member Author

hebasto commented Feb 7, 2022

Guix builds:

$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
0d6768c3fdc012962ba1878895c141ed5899e25bbac1499b0715707b51dc8462  guix-build-edc9a6afdc69/output/aarch64-linux-gnu/SHA256SUMS.part
d7a954a0d765b111ec65a0b5a19de950c879312c4767cab09ef6537f1fede692  guix-build-edc9a6afdc69/output/aarch64-linux-gnu/bitcoin-edc9a6afdc69-aarch64-linux-gnu-debug.tar.gz
f1405ee7fe39f38045b6d486922db712f1e04c11efd25714b784ca84baa19930  guix-build-edc9a6afdc69/output/aarch64-linux-gnu/bitcoin-edc9a6afdc69-aarch64-linux-gnu.tar.gz
4d00611a487f359d737e91c09f4bacc9226bb826d73f3010b76c008cb96324f6  guix-build-edc9a6afdc69/output/arm-linux-gnueabihf/SHA256SUMS.part
f00ddbd531ddd1e6a7d7e4fe185547db8549d97d19ee75424d7458b1e10be24c  guix-build-edc9a6afdc69/output/arm-linux-gnueabihf/bitcoin-edc9a6afdc69-arm-linux-gnueabihf-debug.tar.gz
e90242bfce017813d365d084367f6a9eef17f730390354099289e9498ef0763c  guix-build-edc9a6afdc69/output/arm-linux-gnueabihf/bitcoin-edc9a6afdc69-arm-linux-gnueabihf.tar.gz
58b39df0f287b3009765b4236871a0bcfb159a0fe5cf58ec33eb64118f0adc50  guix-build-edc9a6afdc69/output/arm64-apple-darwin/SHA256SUMS.part
613584af93e6bf5ca3bbbfe23fa15675996a53f6e9f8b406918099bb8b27b074  guix-build-edc9a6afdc69/output/arm64-apple-darwin/bitcoin-edc9a6afdc69-arm64-apple-darwin.tar.gz
941649c23ff614a025affab3ae1bf43f3a396f2292a0a88c09d044990a1380e2  guix-build-edc9a6afdc69/output/arm64-apple-darwin/bitcoin-edc9a6afdc69-osx-unsigned.dmg
2192828163be53f0f8e6c9e82ba91815b20e7ed52475bedfa256f4de159047b5  guix-build-edc9a6afdc69/output/arm64-apple-darwin/bitcoin-edc9a6afdc69-osx-unsigned.tar.gz
209e523fdf3c3587876c659bfec6ff05829d03b118af6b234b13ab07c03eddf2  guix-build-edc9a6afdc69/output/dist-archive/bitcoin-edc9a6afdc69.tar.gz
2de7ebd870a00167056b34a23c2e2c55e56f8bc5e162ab5758fdf82e71c9208b  guix-build-edc9a6afdc69/output/powerpc64-linux-gnu/SHA256SUMS.part
87587fbfb0a48bb3f4fc44838b41ee00cd59d65150bbf5a11ac11abe94803eee  guix-build-edc9a6afdc69/output/powerpc64-linux-gnu/bitcoin-edc9a6afdc69-powerpc64-linux-gnu-debug.tar.gz
7316912de4ab9ee0231593999ff5c4c91d18475e541317a3522907b2bd663fe2  guix-build-edc9a6afdc69/output/powerpc64-linux-gnu/bitcoin-edc9a6afdc69-powerpc64-linux-gnu.tar.gz
706bd9c0131e24cdc11a3c7c1bd716e3d16c4f56320d7415ed291a10cf393d4b  guix-build-edc9a6afdc69/output/powerpc64le-linux-gnu/SHA256SUMS.part
0a3fec6a0f468a41ad4b5c6e06d7a92cfe974295fe6055a16a0698832511e497  guix-build-edc9a6afdc69/output/powerpc64le-linux-gnu/bitcoin-edc9a6afdc69-powerpc64le-linux-gnu-debug.tar.gz
7c9d39f7886bc51d57259e21f41ecfc5448c1aa64410c795c2fe706b32d2f352  guix-build-edc9a6afdc69/output/powerpc64le-linux-gnu/bitcoin-edc9a6afdc69-powerpc64le-linux-gnu.tar.gz
adc14085e2ba71815fcce25da7ca9219f5e7f479c08a7ffab06b483af9244679  guix-build-edc9a6afdc69/output/riscv64-linux-gnu/SHA256SUMS.part
5096c55fd582bcbe2239120ca26f91fd9fa25efb45fb048d98a9d9ad99c8bee8  guix-build-edc9a6afdc69/output/riscv64-linux-gnu/bitcoin-edc9a6afdc69-riscv64-linux-gnu-debug.tar.gz
de4132edc4b0fe3d67e3df4d6a34c5d4640b0d5efcd9fd2cd59abc36f5dec9f9  guix-build-edc9a6afdc69/output/riscv64-linux-gnu/bitcoin-edc9a6afdc69-riscv64-linux-gnu.tar.gz
6ee6c6ae4ac766779f0521e76664d0b27820e193ab43762541e00ab7f95141d5  guix-build-edc9a6afdc69/output/x86_64-apple-darwin/SHA256SUMS.part
30d22408da7e559f4232d07c83bde6a83d9745de1cad3c9a8414c7c440935d49  guix-build-edc9a6afdc69/output/x86_64-apple-darwin/bitcoin-edc9a6afdc69-osx-unsigned.dmg
95b061e1d7bcb80d5f9eceb31344010dfbc29bd5392e0f129869bd3eac27a79c  guix-build-edc9a6afdc69/output/x86_64-apple-darwin/bitcoin-edc9a6afdc69-osx-unsigned.tar.gz
bc03dc748f9458248e8b6d7552d70abd12fa96ba132fdbf6392ec5dc5bdd3f56  guix-build-edc9a6afdc69/output/x86_64-apple-darwin/bitcoin-edc9a6afdc69-osx64.tar.gz
8b19689f7a653e489afccefc48ee49f844ecdbcbcc3fccd9a0cbfb1ec0ed63ae  guix-build-edc9a6afdc69/output/x86_64-linux-gnu/SHA256SUMS.part
639daf2a84ef75fe30aedfc3ea6dc396dfb46a75408dc02cb04d0d9a0f01f584  guix-build-edc9a6afdc69/output/x86_64-linux-gnu/bitcoin-edc9a6afdc69-x86_64-linux-gnu-debug.tar.gz
a34ab9409810cab2ac75a80e71f99ce63635b6b0d66b65445c2bda10dd2605b5  guix-build-edc9a6afdc69/output/x86_64-linux-gnu/bitcoin-edc9a6afdc69-x86_64-linux-gnu.tar.gz

@bitcoin bitcoin deleted a comment from taveechaimekwan Feb 8, 2022
@fanquake fanquake merged commit 25a91a5 into bitcoin:master Feb 13, 2022
@hebasto hebasto deleted the 220206-underscore branch February 13, 2022 11:30
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Feb 14, 2022
edc9a6a build, refactor: Reuse expat package version in its download path (Hennadii Stepanov)
4bb7821 build, refactor: Use conventional version notation for boost package (Hennadii Stepanov)

Pull request description:

  `boost` package:
  - `.` is used as a separator in versions of other depends packages.

  `expat` package:
  - reuse package version in its download path

  ---

  The straightforward way to verify this PR:
  ```
  $ cd depends
  $ make clean-all
  $ make boost_fetched
  $ make expat_fetched
  ```

ACKs for top commit:
  prusnak:
    ACK edc9a6a
  shaavan:
    ACK edc9a6a

Tree-SHA512: c15d672fe34ac59850425d3d6a6eee5f720e16d227aad1332a563b218465879b7ee6fb865dd1bac06aedf356f9bb1c67112d9d88da8f877f04838b50a9dc97be
@bitcoin bitcoin locked and limited conversation to collaborators Feb 14, 2023
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.

6 participants