pythongh-103186: In test_tools.freeze, fetch CONFIG_ARGS from original source directory (pythonGH-103213)

TabLand · miss-islington · commit f1edb99638ed · 2023-07-12T07:00:20.000Z
Fetch CONFIG_ARGS from the original source directory, instead of from the copied source tree. When "make clean" is executed in the copied source tree, the build directory is cleared and the configure argument lookup fails. However, the original source directory still contains this information. (cherry picked from commit de82732) Co-authored-by: Ijtaba Hussain <ijtabahussain@live.com>
diff --git a/Misc/NEWS.d/next/Tools-Demos/2023-04-05-07-19-36.gh-issue-103186.yEozgK.rst b/Misc/NEWS.d/next/Tools-Demos/2023-04-05-07-19-36.gh-issue-103186.yEozgK.rst
@@ -0,0 +1,2 @@
+``freeze`` now fetches ``CONFIG_ARGS`` from the original CPython instance
+the Makefile uses to call utility scripts. Patch by Ijtaba Hussain.
diff --git a/Tools/freeze/test/freeze.py b/Tools/freeze/test/freeze.py
@@ -153,7 +153,7 @@ def prepare(script=None, outdir=None):
     print(f'configuring python in {builddir}...')
     cmd = [
         os.path.join(srcdir, 'configure'),
-        *shlex.split(get_config_var(srcdir, 'CONFIG_ARGS') or ''),
+        *shlex.split(get_config_var(SRCDIR, 'CONFIG_ARGS') or ''),
     ]
     ensure_opt(cmd, 'cache-file', os.path.join(outdir, 'python-config.cache'))
     prefix = os.path.join(outdir, 'python-installation')

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+``freeze`` now fetches ``CONFIG_ARGS`` from the original CPython instance
	`2`	`+the Makefile uses to call utility scripts. Patch by Ijtaba Hussain.`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ def prepare(script=None, outdir=None):`
`153`	`153`	`print(f'configuring python in {builddir}...')`
`154`	`154`	`cmd = [`
`155`	`155`	`os.path.join(srcdir, 'configure'),`
`156`		`- *shlex.split(get_config_var(srcdir, 'CONFIG_ARGS') or ''),`
	`156`	`+ *shlex.split(get_config_var(SRCDIR, 'CONFIG_ARGS') or ''),`
`157`	`157`	`]`
`158`	`158`	`ensure_opt(cmd, 'cache-file', os.path.join(outdir, 'python-config.cache'))`
`159`	`159`	`prefix = os.path.join(outdir, 'python-installation')`