Revert pydebug python config setting

saltstack · Sep 4, 2023 · 68a4f68 · 68a4f68
1 parent 6b40011
commit 68a4f68
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/relenv/build/common.py b/relenv/build/common.py
@@ -1419,10 +1419,10 @@ def find_pythonlib(libdir):
         )
 
     if sys.platform == "linux":
-        pyconf = f"config-{env['RELENV_PY_MAJOR_VERSION']}d-{env['RELENV_HOST']}"
+        pyconf = f"config-{env['RELENV_PY_MAJOR_VERSION']}-{env['RELENV_HOST']}"
         patch_shebang(
             str(pymodules / pyconf / "python-config.py"),
-            "#!{}".format(str(bindir / f"python{env['RELENV_PY_MAJOR_VERSION']}d")),
+            "#!{}".format(str(bindir / f"python{env['RELENV_PY_MAJOR_VERSION']}")),
             format_shebang("../../../bin/python3"),
         )
 

diff --git a/relenv/build/linux.py b/relenv/build/linux.py
@@ -44,6 +44,7 @@ def populate_env(env, dirs):
     ]
     env["LDFLAGS"] = " ".join(ldflags).format(prefix=dirs.prefix)
     cflags = [
+        "-g",
         "-I{prefix}/include",
         "-I{prefix}/include/readline",
         "-I{prefix}/include/ncursesw",
@@ -357,7 +358,6 @@ def build_python(env, dirs, logfp):
         f"--build={env['RELENV_BUILD']}",
         f"--host={env['RELENV_HOST']}",
         "--disable-test-modules",
-        "--with-pydebug",
         "--with-ssl-default-suites=openssl",
         "--with-builtin-hashlib-hashes=blake2",
     ]

diff --git a/tests/test_verify_build.py b/tests/test_verify_build.py
@@ -463,7 +463,7 @@ def validate_shebang(path):
             build
             / "lib"
             / f"python{minor_version}"
-            / f"config-{minor_version}d-{get_triplet()}"
+            / f"config-{minor_version}-{get_triplet()}"
             / "python-config.py"
         )
         assert path.exists()