depends: Various config.site.in improvements and linting #20359

pull dongcarl wants to merge 3 commits into bitcoin:master from dongcarl:2020-11-config-site-cleanup changing 2 files +15 −4
  1. dongcarl commented at 10:01 PM on November 9, 2020: member

    This changeset:

    1. Allows the CONFIG_SITE env var to be a relative path rather than requiring an absolute one
    2. Enables linting of the config.site.in file with shellcheck in our linting scripts
    3. Sets the PYTHONPATH var sensibly in config.site.in

    Please see commit messages for more details

  2. depends: Allow relative CONFIG_SITE path env var
    Previously, if ./configure was invoked with:
    
    ```
    $ env CONFIG_SITE=depends/x86_64-pc-linux-gnu/share/config.site ./configure
    ```
    
    Where $CONFIG_SITE was a relative path, ./configure would fail with the
    following misleading output:
    
    ```
    checking for boostlib >= 1.58.0 (105800)... yes
    checking whether the Boost::System library is available... yes
    configure: error: Could not find a version of the Boost::System library!
    ```
    
    Fully resolving depends_prefix in config.site.in fixes this. To make
    sure that there are no other side effects I ran a diff on the
    config.status generated by:
    
    1. The scripts prior to this change with CONFIG_SITE set to a full path:
           env CONFIG_SITE=$PWD/depends/x86_64-pc-linux-gnu/share/config.site ./configure
    2. The scripts after this change with CONFIG_SITE set to a relative path:
           env CONFIG_SITE=depends/x86_64-pc-linux-gnu/share/config.site ./configure
    
    And it looks good!
    
    Diff: https://paste.sr.ht/~dongcarl/95b469fbc555c128046e85723d87a9082a754f6b
    6c7e8f067d
  3. lint: Also lint files with shellcheck directive
    Files like config.site.in are not referenced by any other script in our
    tree, so we need to mark it manually with a "shellcheck shell="
    directive and make sure that shellcheck is run on them.
    618cbd2c1a
  4. depends: Fix PYTHONPATH setting in config.site.in
    Previously, when running ./configure:
    
    1. With CONFIG_SITE pointed to our depends config.site.in, and
    2. PYTHONPATH was not set either in the environment or by the user
    
    The configure would output something like:
    
    PYTHONPATH='depends/x86_64-pc-linux-gnu/share/../native/lib/python3/dist-packages:'
    
    When we really mean:
    
    PYTHONPATH='depends/x86_64-pc-linux-gnu/share/../native/lib/python3/dist-packages'
    
    ...without the colon
    
    This change makes sure that:
    
    1. There's no trailing colon, and
    2. We use the $PATH_SEPARATOR variable instead of a colon
    46756a6987
  5. DrahtBot added the label Build system on Nov 9, 2020
  6. fanquake added the label Needs gitian build on Nov 10, 2020
  7. fanquake added the label Needs Guix build on Nov 10, 2020
  8. practicalswift commented at 3:56 PM on November 10, 2020: contributor

    Concept ACK

    Nice to see those files being modernized and tidied up.

    Even nicer having a guarantee they will stay that way thanks to linting!

  9. DrahtBot commented at 2:06 PM on November 12, 2020: member

    <!--9cd9c72976c961c55c7acef8f6ba82cd-->

    Guix builds

    File commit fa8dd34e918cd80db215df8937aaf6bb1552fcd9<br>(master) commit ce1159e8ae67491edbf7586f693c25ada45374ae<br>(master and this pull)
    *-aarch64-linux-gnu-debug.tar.gz 2920f7c69e16e9ae... 4e6c8007ce69bd6e...
    *-aarch64-linux-gnu.tar.gz 8c8704570b205375... a3083f46121cb363...
    *-arm-linux-gnueabihf-debug.tar.gz 521e898a64241d9b... d2aa73e18d63e89e...
    *-arm-linux-gnueabihf.tar.gz f5f7a27aa5725d6b... 71efceb131312089...
    *-riscv64-linux-gnu-debug.tar.gz 38f7aee1c530fefc... a6303a68aab45ac8...
    *-riscv64-linux-gnu.tar.gz b050eaa1071c49f2... 67ef22fb4f10aa4c...
    *-win-unsigned.tar.gz 679ee639127c799a... bd512271fc446b2a...
    *-win64-debug.zip 47655d356ac6f38b... ae1f614158c1ad4c...
    *-win64-setup-unsigned.exe 94edc6469f18b678... ebaa58b62bd2f76b...
    *-win64.zip 5530cd812d72aeb7... fee505ace5295f44...
    *-x86_64-linux-gnu-debug.tar.gz f562f5e9c94ed019... 14f1442a5a4f8238...
    *-x86_64-linux-gnu.tar.gz f818e1ec923d60dd... 078b2782e024d9df...
    *.tar.gz 03fa1e65c66cd166... e8402205a2a9ce7b...
    guix_build.log df9b6e0870743e5d... a88ff8e7a1ec1711...
    guix_build.log.diff dd9939f262dcaeb4...
  10. DrahtBot removed the label Needs Guix build on Nov 12, 2020
  11. DrahtBot commented at 5:57 PM on November 13, 2020: member

    <!--a722867cd34abeea1fadc8d60700f111-->

    Gitian builds

    File commit 9bd1316697292251ed5690390794fc64517fc86b<br>(master) commit 8df90620cebb8bbf2489270bd3e41ddbd29cc0d3<br>(master and this pull)
    *-aarch64-linux-gnu-debug.tar.gz 3db97c8d57eafd40... 2780a653ee279a69...
    *-aarch64-linux-gnu.tar.gz 7177e87fa21510c4... 3732e91e93aa4713...
    *-arm-linux-gnueabihf-debug.tar.gz de949360e89ca7e2... d92cd225173d226c...
    *-arm-linux-gnueabihf.tar.gz db92b060ef5f368d... a7e663ae7737eec0...
    *-osx-unsigned.dmg b9873d776a740dfa... 068a78fb2c32c52b...
    *-osx64.tar.gz 76843fd4454474d0... 0c566b881161fb77...
    *-riscv64-linux-gnu-debug.tar.gz 7800e259dfae5375... 0cf3ad0c6ca0c6ee...
    *-riscv64-linux-gnu.tar.gz fa1e5a6e6038d9b9... 60938676e6223fd5...
    *-win64-debug.zip 134801c89b67e956... 2265656c2151c8ef...
    *-win64-setup-unsigned.exe b4ddfe0ad9081707... 4cdc725104a2e9ec...
    *-win64.zip 163278774d745486... 4bd217231aa41d4d...
    *-x86_64-linux-gnu-debug.tar.gz 888b6f88584393a1... 5f605aa229d23675...
    *-x86_64-linux-gnu.tar.gz 8779618b53513b4e... 32696dbf318524f6...
    *.tar.gz 0069354516661e24... 7fcf8f6a1434d689...
    bitcoin-core-linux-0.21-res.yml 003deb12731f3ac3... 214f95c76785fd51...
    bitcoin-core-osx-0.21-res.yml d3c14565c88c1b9f... 9dc0673b22ef5ef6...
    bitcoin-core-win-0.21-res.yml 3e726a36d3e22fe4... 12aeebe54632c154...
    linux-build.log 3c1b0e7b94595c46... 2fd74dc5c08a1429...
    osx-build.log e9caa22e1dc57761... 9520901d88e67934...
    win-build.log 3ff1cd4fa1e23bb3... 992490849cb30e2e...
    bitcoin-core-linux-0.21-res.yml.diff 6a5f6d924e0c9408...
    bitcoin-core-osx-0.21-res.yml.diff 115f2c334e1c9649...
    bitcoin-core-win-0.21-res.yml.diff 873ed6337b29d608...
    linux-build.log.diff 073f5613103ee309...
    osx-build.log.diff 7c618f4331f53c7e...
    win-build.log.diff 03c02ab55b5cfabf...
  12. DrahtBot removed the label Needs gitian build on Nov 13, 2020
  13. DrahtBot commented at 1:47 PM on November 16, 2020: member

    <!--e57a25ab6845829454e8d69fc972939a-->

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

    <!--174a7506f384e20aa4161008e828411d-->

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #18261 (Erlay: bandwidth-efficient transaction relay protocol by naumenkogs)

    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.

  14. laanwj commented at 10:31 AM on November 19, 2020: member

    ACK 46756a69877ab7d56f3b05f8c5a8899eb24d9ffd

    These are obvious improvements to the shell script.

  15. laanwj merged this on Nov 19, 2020
  16. laanwj closed this on Nov 19, 2020

  17. sidhujag referenced this in commit 1489144fac on Nov 19, 2020
  18. kittywhiskers referenced this in commit 053474b528 on Jul 15, 2021
  19. kittywhiskers referenced this in commit 6bbf7ee811 on Jul 15, 2021
  20. kittywhiskers referenced this in commit 5f71d0b859 on Jul 20, 2021
  21. kittywhiskers referenced this in commit 054cdfafa2 on Jul 20, 2021
  22. kittywhiskers referenced this in commit 652f3a47b2 on Jul 20, 2021
  23. kittywhiskers referenced this in commit a8b1681d27 on Jul 20, 2021
  24. kittywhiskers referenced this in commit 259f3fbaf1 on Aug 1, 2021
  25. kittywhiskers referenced this in commit 9ef3968fff on Aug 24, 2021
  26. kittywhiskers referenced this in commit 6e72fa5384 on Aug 24, 2021
  27. kittywhiskers referenced this in commit b858cf7b5a on Aug 24, 2021
  28. kittywhiskers referenced this in commit 1214fb4430 on Aug 25, 2021
  29. kittywhiskers referenced this in commit 61d96ca7d9 on Aug 25, 2021
  30. kittywhiskers referenced this in commit 3a763d5249 on Aug 26, 2021
  31. kittywhiskers referenced this in commit 09a6c82a94 on Aug 26, 2021
  32. kittywhiskers referenced this in commit 8307b25029 on Aug 26, 2021
  33. kittywhiskers referenced this in commit 0a2cf9667c on Aug 27, 2021
  34. kittywhiskers referenced this in commit 9abc834aa9 on Aug 30, 2021
  35. kittywhiskers referenced this in commit 84bb7e92b5 on Sep 1, 2021
  36. kittywhiskers referenced this in commit e0fe759e61 on Sep 1, 2021
  37. kittywhiskers referenced this in commit b841bd4003 on Sep 1, 2021
  38. kittywhiskers referenced this in commit 95945caf04 on Sep 1, 2021
  39. kittywhiskers referenced this in commit 39c5fcd29d on Sep 2, 2021
  40. kittywhiskers referenced this in commit ac3b1da10d on Sep 3, 2021
  41. kittywhiskers referenced this in commit 6e4d09e2a3 on Sep 3, 2021
  42. kittywhiskers referenced this in commit 1beb7bb046 on Sep 3, 2021
  43. DrahtBot locked this on Feb 15, 2022

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: 2026-05-01 03:14 UTC

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