bpo-22140: Prevent double substitution of prefix in python-config.sh #3769
Conversation
This file contains hidden or 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
Fix the logic in python-config.sh to avoid attempting to substitute
prefix in a variable that might have already been subject to
substitution. This e.g. happened if @exec_prefix@ was defined as
"${prefix}" (which is the default of the configure script) -- in which
case the exec_prefix_build variable was initialized with
already-subtituted prefix, and then another round of substitution was
performed which might have resulted in duplicate prefix.
To avoid that, rename the variables so that the variables matching
likely configure names (prefix, exec_prefix) retain their original
values and a '_real' suffix is used for the real values of prefix.
Furthermore, replace the unnecessary prefix and exec_prefix
substitutions with direct prefix_real references since the sed
always replaced the whole string anyway by design.
|
Thanks @mgorny for the PR, and @benjaminp for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6. |
benjaminp
pushed a commit
that referenced
this pull request
Sep 27, 2017
…on-config.sh (GH-3769) Fix the logic in python-config.sh to avoid attempting to substitute prefix in a variable that might have already been subject to substitution. This e.g. happened if @exec_prefix@ was defined as "${prefix}" (which is the default of the configure script) -- in which case the exec_prefix_build variable was initialized with already-subtituted prefix, and then another round of substitution was performed which might have resulted in duplicate prefix. To avoid that, rename the variables so that the variables matching likely configure names (prefix, exec_prefix) retain their original values and a '_real' suffix is used for the real values of prefix. Furthermore, replace the unnecessary prefix and exec_prefix substitutions with direct prefix_real references since the sed always replaced the whole string anyway by design. (cherry picked from commit 14086cf)
|
GH-3793 is a backport of this pull request to the 3.6 branch. |
benjaminp
added a commit
that referenced
this pull request
Sep 28, 2017
…on-config.sh (GH-3769) (#3793) Fix the logic in python-config.sh to avoid attempting to substitute prefix in a variable that might have already been subject to substitution. This e.g. happened if @exec_prefix@ was defined as "${prefix}" (which is the default of the configure script) -- in which case the exec_prefix_build variable was initialized with already-subtituted prefix, and then another round of substitution was performed which might have resulted in duplicate prefix. To avoid that, rename the variables so that the variables matching likely configure names (prefix, exec_prefix) retain their original values and a '_real' suffix is used for the real values of prefix. Furthermore, replace the unnecessary prefix and exec_prefix substitutions with direct prefix_real references since the sed always replaced the whole string anyway by design. (cherry picked from commit 14086cf)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix the logic in python-config.sh to avoid attempting to substitute
prefix in a variable that might have already been subject to
substitution. This e.g. happened if @exec_prefix@ was defined as
"${prefix}" (which is the default of the configure script) -- in which
case the exec_prefix_build variable was initialized with
already-subtituted prefix, and then another round of substitution was
performed which might have resulted in duplicate prefix.
To avoid that, rename the variables so that the variables matching
likely configure names (prefix, exec_prefix) retain their original
values and a '_real' suffix is used for the real values of prefix.
Furthermore, replace the unnecessary prefix and exec_prefix
substitutions with direct prefix_real references since the sed
always replaced the whole string anyway by design.
https://bugs.python.org/issue22140