]> granicus.if.org Git - python/commit
closes bpo-22140: Prevent double substitution of prefix in python-config.sh (#3769)
authorMichał Górny <mgorny@gentoo.org>
Wed, 27 Sep 2017 05:45:06 +0000 (07:45 +0200)
committerBenjamin Peterson <benjamin@python.org>
Wed, 27 Sep 2017 05:45:06 +0000 (22:45 -0700)
commit14086cfc5eed8c5e78342d79e5db87a135d75fa8
treede496547ead8046e677932ac396ffd8544bffef6
parent31aca4bf79217e6ec4c1d056d3ad7ed4dd469c78
closes bpo-22140: Prevent double substitution of prefix in python-config.sh (#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.
Misc/NEWS.d/next/Build/2017-09-26-22-39-58.bpo-22140.ZRf7Wn.rst [new file with mode: 0644]
Misc/python-config.sh.in