Work with setuptools>=72.2.0

- No longer include "-static-libstdc++" in CFLAGS
- Add libstdc++ to relenv bundles
- When RELENV_BUILDENV environment is set, update environment with
  buildenv rather than only updating sysconfig.
- Clean up linux populate_environment method syntax
- Stop duplicating rpath durring python build step

Author: dwoz

CHANGELOG.md

@@ -1,11 +1,14 @@
-0.18.2
+0.19.0
 ======
 
 * Update python 3.10 to 3.10.17:
   https://www.python.org/downloads/release/python-31017/
 * Update python 3.13 to 3.13.3
 * Update libxcrypt to 4.4.38
+* Update libffi to 3.4.8
 * Update gdbm to 1.25
+* Include libstdc++ in relenv lib
+* Update environment with buildenv when RELENV_BUILDENV environment is set.
 
 
 0.18.1

relenv/build/common.py

@@ -1407,7 +1407,13 @@ def install_runtime(sitepackages):
     relenv = sitepackages / "relenv"
     os.makedirs(relenv, exist_ok=True)
 
-    for name in ["runtime.py", "relocate.py", "common.py", "__init__.py"]:
+    for name in [
+        "runtime.py",
+        "relocate.py",
+        "common.py",
+        "buildenv.py",
+        "__init__.py",
+    ]:
         src = MODULE_DIR / name
         dest = relenv / name
         with io.open(src, "r") as rfp:
@@ -1433,6 +1439,15 @@ def finalize(env, dirs, logfp):
     # Install relenv-sysconfigdata module
     libdir = pathlib.Path(dirs.prefix) / "lib"
 
+    shutil.copy(
+        pathlib.Path(dirs.toolchain)
+        / env["RELENV_HOST"]
+        / "sysroot"
+        / "lib"
+        / "libstdc++.so.6",
+        libdir,
+    )
+
     def find_pythonlib(libdir):
         for root, dirs, files in os.walk(libdir):
             for _ in dirs:

relenv/build/linux.py

@@ -35,38 +35,35 @@ def populate_env(env, dirs):
     :type dirs: ``relenv.build.common.Dirs``
     """
     # CC and CXX need to be to have the full path to the executable
-    env["CC"] = "{}/bin/{}-gcc -no-pie".format(dirs.toolchain, env["RELENV_HOST"])
-    env["CXX"] = "{}/bin/{}-g++ -no-pie".format(dirs.toolchain, env["RELENV_HOST"])
+    env["CC"] = f"{dirs.toolchain}/bin/{env['RELENV_HOST']}-gcc -no-pie"
+    env["CXX"] = f"{dirs.toolchain}/bin/{env['RELENV_HOST']}-g++ -no-pie"
     # Add our toolchain binaries to the path. We also add the bin directory of
     # our prefix so that libtirpc can find krb5-config
-    env["PATH"] = "{}/bin/:{}/bin/:{PATH}".format(dirs.toolchain, dirs.prefix, **env)
+    env["PATH"] = f"{dirs.toolchain}/bin/:{dirs.prefix}/bin/:{env['PATH']}"
     ldflags = [
         "-Wl,--build-id=sha1",
-        "-Wl,--rpath={prefix}/lib",
-        "-L{prefix}/lib",
-        "-L{}/{RELENV_HOST}/sysroot/lib".format(dirs.toolchain, **env),
-        "-static-libstdc++",
+        f"-Wl,--rpath={dirs.prefix}/lib",
+        f"-L{dirs.prefix}/lib",
+        f"-L{dirs.toolchain}/{env['RELENV_HOST']}/sysroot/lib",
     ]
-    env["LDFLAGS"] = " ".join(ldflags).format(prefix=dirs.prefix)
+    env["LDFLAGS"] = " ".join(ldflags)
     cflags = [
         "-g",
-        "-I{prefix}/include",
-        "-I{prefix}/include/readline",
-        "-I{prefix}/include/ncursesw",
-        "-I{}/{RELENV_HOST}/sysroot/usr/include".format(dirs.toolchain, **env),
+        f"-I{dirs.prefix}/include",
+        f"-I{dirs.prefix}/include/readline",
+        f"-I{dirs.prefix}/include/ncursesw",
+        f"-I{dirs.toolchain}/{env['RELENV_HOST']}/sysroot/usr/include",
     ]
-    env["CFLAGS"] = " ".join(cflags).format(prefix=dirs.prefix)
+    env["CFLAGS"] = " ".join(cflags)
     # CPPFLAGS are needed for Python's setup.py to find the 'nessicery bits'
     # for things like zlib and sqlite.
     cpplags = [
-        "-I{prefix}/include",
-        "-I{prefix}/include/readline",
-        "-I{prefix}/include/ncursesw",
-        "-I{}/{RELENV_HOST}/sysroot/usr/include".format(dirs.toolchain, **env),
+        f"-I{dirs.prefix}/include",
+        f"-I{dirs.prefix}/include/readline",
+        f"-I{dirs.prefix}/include/ncursesw",
+        f"-I{dirs.toolchain}/{env['RELENV_HOST']}/sysroot/usr/include",
     ]
-    env["CPPFLAGS"] = " ".join(cpplags).format(prefix=dirs.prefix)
-    env["CXXFLAGS"] = " ".join(cpplags).format(prefix=dirs.prefix)
-    env["LD_LIBRARY_PATH"] = "{prefix}/lib"
+    env["CPPFLAGS"] = " ".join(cpplags)
     env["PKG_CONFIG_PATH"] = f"{dirs.prefix}/lib/pkgconfig"
 
 
@@ -354,9 +351,9 @@ def build_python(env, dirs, logfp):
     :param logfp: A handle for the log file
     :type logfp: file
     """
-    env["LDFLAGS"] = "-Wl,--rpath={prefix}/lib {ldflags}".format(
-        prefix=dirs.prefix, ldflags=env["LDFLAGS"]
-    )
+    ldflagopt = f"-Wl,--rpath={dirs.prefix}/lib"
+    if ldflagopt not in env["LDFLAGS"]:
+        env["LDFLAGS"] = f"{ldflagopt} {env['LDFLAGS']}"
 
     # Needed when using a toolchain even if build and host match.
     runcmd(
@@ -433,6 +430,8 @@ def build_python(env, dirs, logfp):
     with io.open("Modules/Setup", "a+") as fp:
         fp.seek(0, io.SEEK_END)
         fp.write("*disabled*\n" "_tkinter\n" "nsl\n" "nis\n")
+    for _ in ["LDFLAGS", "CFLAGS", "CPPFLAGS", "CXX", "CC"]:
+        env.pop(_)
     runcmd(["make", "-j8"], env=env, stderr=logfp, stdout=logfp)
     runcmd(["make", "install"], env=env, stderr=logfp, stdout=logfp)
 
@@ -555,8 +554,8 @@ def build_python(env, dirs, logfp):
     download={
         "url": "https://github.com/libffi/libffi/releases/download/v{version}/libffi-{version}.tar.gz",
         # "fallback_url": "https://woz.io/relenv/dependencies/libffi-{version}.tar.gz",
-        "version": "3.4.7",
-        "checksum": "b07136211f47fa30c0512ebd7484fde724978d99",
+        "version": "3.4.8",
+        "checksum": "6930b77aebe2465a8e1a8617c4c9a8fa3199b256",
         "checkfunc": github_version,
         "checkurl": "https://github.com/libffi/libffi/releases/",
     },

relenv/buildenv.py

@@ -58,6 +58,11 @@ def buildenv(relenv_path=None):
             f"-I{relenv_path}/include "
             f"-I{toolchain}/sysroot/usr/include"
         ),
+        "CXXFLAGS": (
+            f"-I{relenv_path}/include -I{toolchain}/{triplet}/sysroot/usr/include "
+            f"-L{relenv_path}/lib -L{toolchain}/{triplet}/sysroot/lib "
+            f"-Wl,-rpath,{relenv_path}/lib"
+        ),
         "CPPFLAGS": (
             #   f"-L{relenv_path}/lib -L{toolchain}/{triplet}/sysroot/lib "
             f"-I{relenv_path}/include -I{toolchain}/{triplet}/sysroot/usr/include"

relenv/runtime.py

@@ -70,6 +70,17 @@ def relocate():
     return relocate.relocate
 
 
+def buildenv():
+    """
+    Late import relenv buildenv.
+    """
+    if not hasattr(buildenv, "builenv"):
+        buildenv.buildenv = path_import(
+            "relenv.buildenv", str(pathlib.Path(__file__).parent / "buildenv.py")
+        )
+    return buildenv.buildenv
+
+
 def get_major_version():
     """
     Current python major version.
@@ -1024,3 +1035,5 @@ def bootstrap():
     setup_crossroot()
     install_cargo_config()
     sys.meta_path = [importer] + sys.meta_path
+    if "RELENV_BUILDENV" in os.environ:
+        os.environ.update(buildenv().buildenv())

tests/test_verify_build.py

@@ -339,31 +339,35 @@ def test_pip_install_salt_w_package_requirements(
         "23.2.0",
         "25.1.2",
         "26.2.0",
+        "26.4.0",
     ],
 )
 def test_pip_install_pyzmq(pipexec, pyzmq_version, build_version, arch):
 
     if pyzmq_version == "23.2.0" and "3.12" in build_version:
         pytest.xfail(f"{pyzmq_version} does not install on 3.12")
 
+    if pyzmq_version == "23.2.0" and "3.13" in build_version:
+        pytest.xfail(f"{pyzmq_version} does not install on 3.13")
+
     if pyzmq_version == "23.2.0" and sys.platform == "darwin":
         pytest.xfail("pyzmq 23.2.0 fails on macos arm64")
 
-    if sys.platform == "win32" and pyzmq_version == "25.1.2":
-        pytest.xfail("pyzmq 25.1.2 fails on windows")
-
-    if sys.platform == "win32" and pyzmq_version == "23.2.0":
-        pytest.xfail("vcredist not found as of 9/9/24")
-
-    if sys.platform == "win32" and pyzmq_version == "26.2.0":
+    if pyzmq_version == "23.2.0" and sys.platform == "win32":
         pytest.xfail("vcredist not found as of 9/9/24")
 
-    if pyzmq_version == "23.2.0" and "3.13" in build_version:
-        pytest.xfail(f"{pyzmq_version} does not install on 3.13")
-
     if pyzmq_version == "25.1.2" and "3.13" in build_version:
         pytest.xfail(f"{pyzmq_version} does not install on 3.13")
 
+    if pyzmq_version == "25.1.2" and sys.platform == "win32":
+        pytest.xfail("pyzmq 25.1.2 fails on windows")
+
+    if pyzmq_version == "26.2.0" and sys.platform == "win32":
+        pytest.xfail("vcredist not found as of 9/9/24")
+
+    if pyzmq_version == "26.4.0" and sys.platform == "win32":
+        pytest.xfail("Needs troubleshooting 4/12/25")
+
     env = os.environ.copy()
 
     p = subprocess.run(