dongcarl
commented at 10:01 PM on November 9, 2020:
contributor
This changeset:
Allows the CONFIG_SITE env var to be a relative path rather than requiring an absolute one
Enables linting of the config.site.in file with shellcheck in our linting scripts
Sets the PYTHONPATH var sensibly in config.site.in
Please see commit messages for more details
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
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
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
DrahtBot added the label Build system on Nov 9, 2020
fanquake added the label Needs gitian build on Nov 10, 2020
fanquake added the label Needs Guix build on Nov 10, 2020
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!
DrahtBot
commented at 2:06 PM on November 12, 2020:
contributor
DrahtBot removed the label Needs gitian build on Nov 13, 2020
DrahtBot
commented at 1:47 PM on November 16, 2020:
contributor
<!--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.
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-20 06:54 UTC