depends: Various config.site.in improvements and linting #20359
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
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.
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
|
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! |
Gitian builds
|
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
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. |
|
ACK 46756a6 These are obvious improvements to the shell script. |
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Nov 19, 2020
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Jul 15, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Jul 15, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Jul 20, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Jul 20, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Jul 20, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Jul 20, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Aug 1, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Aug 24, 2021
…linting - PYTHONPATH change breaks package detection for some reason
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Aug 24, 2021
…linting - PYTHONPATH change breaks package detection for some reason
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Aug 24, 2021
…linting - PYTHONPATH change breaks package detection for some reason
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Aug 25, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Aug 25, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Aug 26, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Aug 26, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Aug 26, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Aug 27, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Aug 30, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Sep 1, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Sep 1, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Sep 1, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Sep 1, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Sep 2, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Sep 3, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Sep 3, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Sep 3, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This changeset:
CONFIG_SITEenv var to be a relative path rather than requiring an absolute oneconfig.site.infile withshellcheckin our linting scriptsPYTHONPATHvar sensibly inconfig.site.inPlease see commit messages for more details