relenv 0.18.0__py3-none-any.whl → 0.18.2__py3-none-any.whl

relenv/build/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2022-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 The ``relenv build`` command.
@@ -86,6 +86,12 @@ def setup_parser(subparsers):
         action="store_true",
         help="Force downloading source tarballs even if they exist",
     )
+    build_subparser.add_argument(
+        "--download-only",
+        default=False,
+        action="store_true",
+        help="Stop after downloading source tarballs",
+    )
     build_subparser.add_argument(
         "--step",
         dest="steps",
@@ -179,6 +185,7 @@ def main(args):
         clean=args.clean,
         cleanup=not args.no_cleanup,
         force_download=args.force_download,
+        download_only=args.download_only,
         show_ui=show_ui,
         log_level=args.log_level.upper(),
     )

relenv/build/common.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2022-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 Build process common methods.
@@ -801,7 +801,6 @@ class Builder:
         recipies=None,
         build_default=build_default,
         populate_env=populate_env,
-        force_download=False,
         arch="x86_64",
         version="",
     ):
@@ -824,7 +823,6 @@ class Builder:
 
         self.build_default = build_default
         self.populate_env = populate_env
-        self.force_download = force_download
         self.toolchains = get_toolchain(root=self.dirs.root)
         self.set_arch(self.arch)
 
@@ -842,7 +840,6 @@ class Builder:
             recipies,
             self.build_default,
             self.populate_env,
-            self.force_download,
             self.arch,
             version,
         )
@@ -1207,6 +1204,7 @@ class Builder:
         clean=True,
         cleanup=True,
         force_download=False,
+        download_only=False,
         show_ui=False,
         log_level="WARNING",
     ):
@@ -1267,6 +1265,8 @@ class Builder:
         # Start a process for each build passing it an event used to notify each
         # process if it's dependencies have finished.
         self.download_files(steps, force_download=force_download, show_ui=show_ui)
+        if download_only:
+            return
         self.build(steps, cleanup, show_ui=show_ui, log_level=log_level)
 
     def check_versions(self):
@@ -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:
@@ -1495,6 +1501,15 @@ def finalize(env, dirs, logfp):
             format_shebang("../../../bin/python3"),
         )
 
+        shutil.copy(
+            pathlib.Path(dirs.toolchain)
+            / env["RELENV_HOST"]
+            / "sysroot"
+            / "lib"
+            / "libstdc++.so.6",
+            libdir,
+        )
+
     # Moved in python 3.13 or removed?
     if (pymodules / "cgi.py").exists():
         patch_shebang(

relenv/build/darwin.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 The darwin build process.
@@ -72,23 +72,22 @@ def build_python(env, dirs, logfp):
     runcmd(["make", "install"], env=env, stderr=logfp, stdout=logfp)
 
 
-build = builds.add("darwin", populate_env=populate_env, version="3.10.15")
+build = builds.add("darwin", populate_env=populate_env, version="3.10.17")
 
 build.add(
     "openssl",
     build_func=build_openssl,
     download={
         "url": "https://github.com/openssl/openssl/releases/download/openssl-{version}/openssl-{version}.tar.gz",
-        "version": "3.2.3",
-        "checksum": "1c04294b2493a868ac5f65d166c29625181a31ed",
+        "version": "3.2.4",
+        "checksum": "2247802a1193c0f8eb41c870e8de45a2241422d5",
     },
 )
 
 build.add(
     "XZ",
     download={
-        "fallback_url": "http://tukaani.org/xz/xz-{version}.tar.gz",
-        "url": "https://woz.io/relenv/dependencies/xz-{version}.tar.gz",
+        "url": "http://tukaani.org/xz/xz-{version}.tar.gz",
         "version": "5.6.2",
         "checksum": "0d6b10e4628fe08e19293c65e8dbcaade084a083",
     },
@@ -117,7 +116,7 @@ build.add(
         "url": "https://www.python.org/ftp/python/{version}/Python-{version}.tar.xz",
         "fallback_url": "https://woz.io/relenv/dependencies/Python-{version}.tar.gz",
         "version": build.version,
-        "checksum": "f498fd8921e3c37e6aded9acb11ed23c8daa0bbe",
+        "checksum": "d31d548cd2c5ca2ae713bebe346ba15e8406633a",
     },
 )
 
@@ -131,16 +130,16 @@ build.add(
 )
 
 build = build.copy(
-    version="3.11.10", checksum="eb0ee5c84407445809a556592008cfc1867a39bc"
+    version="3.11.11", checksum="acf539109b024d3c5f1fc63d6e7f08cd294ba56d"
 )
 builds.add("darwin", builder=build)
 
 build = build.copy(
-    version="3.12.7", checksum="5a760bbc42c67f1a0aef5bcf7c329348fb88448b"
+    version="3.12.9", checksum="465d8a664e63dc5aa1f0d90cd1d0000a970ee2fb"
 )
 builds.add("darwin", builder=build)
 
 build = build.copy(
-    version="3.13.0", checksum="0f71dce4a3251460985a944bbd1d1b7db1660a91"
+    version="3.13.3", checksum="f26085cf12daef7b60b8a6fe93ef988b9a094aea"
 )
 builds.add("darwin", builder=build)

relenv/build/linux.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 The linux build process.
@@ -35,38 +35,36 @@ 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"
+    env["CXX"] = f"{dirs.toolchain}/bin/{env['RELENV_HOST']}-g++"
     # 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["CXXFLAGS"] = " ".join(cpplags)
+    env["CPPFLAGS"] = " ".join(cpplags)
     env["PKG_CONFIG_PATH"] = f"{dirs.prefix}/lib/pkgconfig"
 
 
@@ -85,12 +83,12 @@ def build_bzip2(env, dirs, logfp):
         [
             "make",
             "-j8",
-            "PREFIX={}".format(dirs.prefix),
-            "LDFLAGS={}".format(env["LDFLAGS"]),
+            f"PREFIX={dirs.prefix}",
+            f"LDFLAGS={env['LDFLAGS']}",
             "CFLAGS=-fPIC",
-            "CC={}".format(env["CC"]),
-            "BUILD={}".format("x86_64-linux-gnu"),
-            "HOST={}".format(env["RELENV_HOST"]),
+            f"CC={env['CC']}",
+            "BUILD=x86_64-linux-gnu",
+            f"HOST={env['RELENV_HOST']}",
             "install",
         ],
         env=env,
@@ -102,10 +100,10 @@ def build_bzip2(env, dirs, logfp):
             "make",
             "-f",
             "Makefile-libbz2_so",
-            "CC={}".format(env["CC"]),
-            "LDFLAGS={}".format(env["LDFLAGS"]),
-            "BUILD={}".format("x86_64-linux-gnu"),
-            "HOST={}".format(env["RELENV_HOST"]),
+            f"CC={env['CC']}",
+            f"LDFLAGS={env['LDFLAGS']}",
+            "BUILD=x86_64-linux-gnu",
+            f"HOST={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,
@@ -128,10 +126,10 @@ def build_libxcrypt(env, dirs, logfp):
     runcmd(
         [
             "./configure",
-            "--prefix={}".format(dirs.prefix),
+            f"--prefix={dirs.prefix}",
             # "--enable-libgdbm-compat",
-            "--build={}".format(env["RELENV_BUILD"]),
-            "--host={}".format(env["RELENV_HOST"]),
+            f"--build={env['RELENV_BUILD']}",
+            f"--host={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,
@@ -155,10 +153,10 @@ def build_gdbm(env, dirs, logfp):
     runcmd(
         [
             "./configure",
-            "--prefix={}".format(dirs.prefix),
+            f"--prefix={dirs.prefix}",
             "--enable-libgdbm-compat",
-            "--build={}".format(env["RELENV_BUILD"]),
-            "--host={}".format(env["RELENV_HOST"]),
+            f"--build={env['RELENV_BUILD']}",
+            f"--host={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,
@@ -205,19 +203,20 @@ def build_ncurses(env, dirs, logfp):
             "--disable-stripping",
             f"--with-pkg-config={dirs.prefix}/lib/pkgconfig",
             "--enable-pc-files",
-            "--build={}".format(env["RELENV_BUILD"]),
-            "--host={}".format(env["RELENV_HOST"]),
+            f"--build={env['RELENV_BUILD']}",
+            f"--host={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,
         stdout=logfp,
     )
     runcmd(["make", "-j8"], env=env, stderr=logfp, stdout=logfp)
+    ticdir = str(pathlib.Path(dirs.tmpbuild) / "progs" / "tic")
     runcmd(
         [
             "make",
-            "DESTDIR={}".format(dirs.prefix),
-            "TIC_PATH={}".format(str(pathlib.Path(dirs.tmpbuild) / "progs" / "tic")),
+            f"DESTDIR={dirs.prefix}",
+            f"TIC_PATH={ticdir}",
             "install",
         ],
         env=env,
@@ -240,12 +239,12 @@ def build_readline(env, dirs, logfp):
     env["LDFLAGS"] = f"{env['LDFLAGS']} -ltinfow"
     cmd = [
         "./configure",
-        "--prefix={}".format(dirs.prefix),
+        f"--prefix={dirs.prefix}",
     ]
     if env["RELENV_HOST"].find("linux") > -1:
         cmd += [
-            "--build={}".format(env["RELENV_BUILD"]),
-            "--host={}".format(env["RELENV_HOST"]),
+            f"--build={env['RELENV_BUILD']}",
+            f"--host={env['RELENV_HOST']}",
         ]
     runcmd(cmd, env=env, stderr=logfp, stdout=logfp)
     runcmd(["make", "-j8"], env=env, stderr=logfp, stdout=logfp)
@@ -266,10 +265,10 @@ def build_libffi(env, dirs, logfp):
     runcmd(
         [
             "./configure",
-            "--prefix={}".format(dirs.prefix),
+            f"--prefix={dirs.prefix}",
             "--disable-multi-os-directory",
-            "--build={}".format(env["RELENV_BUILD"]),
-            "--host={}".format(env["RELENV_HOST"]),
+            f"--build={env['RELENV_BUILD']}",
+            f"--host={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,
@@ -294,12 +293,12 @@ def build_zlib(env, dirs, logfp):
     :param logfp: A handle for the log file
     :type logfp: file
     """
-    env["CFLAGS"] = "-fPIC {}".format(env["CFLAGS"])
+    env["CFLAGS"] = f"-fPIC {env['CFLAGS']}"
     runcmd(
         [
             "./configure",
-            "--prefix={}".format(dirs.prefix),
-            "--libdir={}/lib".format(dirs.prefix),
+            f"--prefix={dirs.prefix}",
+            f"--libdir={dirs.prefix}/lib",
             "--shared",
         ],
         env=env,
@@ -329,11 +328,11 @@ def build_krb(env, dirs, logfp):
     runcmd(
         [
             "./configure",
-            "--prefix={}".format(dirs.prefix),
+            f"--prefix={dirs.prefix}",
             "--without-system-verto",
             "--without-libedit",
-            "--build={}".format(env["RELENV_BUILD"]),
-            "--host={}".format(env["RELENV_HOST"]),
+            f"--build={env['RELENV_BUILD']}",
+            f"--host={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,
@@ -354,9 +353,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 +432,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)
 
@@ -444,16 +445,15 @@ def build_python(env, dirs, logfp):
     # runcmd([str(python), "-m", "ensurepip", "-U"], env=env, stderr=logfp, stdout=logfp)
 
 
-build = builds.add("linux", populate_env=populate_env, version="3.10.15")
+build = builds.add("linux", populate_env=populate_env, version="3.10.17")
 
 build.add(
     "openssl",
     build_func=build_openssl,
     download={
         "url": "https://github.com/openssl/openssl/releases/download/openssl-{version}/openssl-{version}.tar.gz",
-        "fallback_url": "https://woz.io/relenv/dependencies/openssl-{version}.tar.gz",
-        "version": "3.2.3",
-        "checksum": "1c04294b2493a868ac5f65d166c29625181a31ed",
+        "version": "3.2.4",
+        "checksum": "2247802a1193c0f8eb41c870e8de45a2241422d5",
         "checkfunc": tarball_version,
         "checkurl": "https://www.openssl.org/source/",
     },
@@ -466,7 +466,6 @@ build.add(
     wait_on=["openssl"],
     download={
         "url": "https://www.openssl.org/source/openssl-{version}.tar.gz",
-        "fallback_url": "https://woz.io/relenv/dependencies/openssl-{version}.tar.gz",
         "version": "3.0.8",
         "checksum": "580d8a7232327fe1fa6e7db54ac060d4321f40ab",
         "checkfunc": tarball_version,
@@ -479,8 +478,8 @@ build.add(
     "libxcrypt",
     download={
         "url": "https://github.com/besser82/libxcrypt/releases/download/v{version}/libxcrypt-{version}.tar.xz",
-        "version": "4.4.36",
-        "checksum": "c040de2fd534f84082c9c42114ba11b4e1a67635",
+        "version": "4.4.38",
+        "checksum": "9aa2fa261be6144af492e9b6bfd03bfaa47f7159",
         "checkfunc": github_version,
         "checkurl": "https://github.com/besser82/libxcrypt/releases/",
     },
@@ -490,7 +489,6 @@ build.add(
     "XZ",
     download={
         "url": "http://tukaani.org/xz/xz-{version}.tar.gz",
-        "fallback_url": "https://woz.io/relenv/dependencies/xz-{version}.tar.gz",
         "version": "5.6.2",
         "checksum": "0d6b10e4628fe08e19293c65e8dbcaade084a083",
         "checkfunc": tarball_version,
@@ -502,7 +500,6 @@ build.add(
     build_func=build_sqlite,
     download={
         "url": "https://sqlite.org/2024/sqlite-autoconf-{version}.tar.gz",
-        "fallback_url": "https://woz.io/relenv/dependencies/sqlite-autoconf-{version}.tar.gz",
         "version": "3460100",
         "checksum": "1fdbada080f3285ac864c314bfbfc581b13e804b",
         "checkfunc": sqlite_version,
@@ -515,7 +512,6 @@ build.add(
     build_func=build_bzip2,
     download={
         "url": "https://sourceware.org/pub/bzip2/bzip2-{version}.tar.gz",
-        "fallback_url": "https://woz.io/relenv/dependencies/bzip2-{version}.tar.gz",
         "version": "1.0.8",
         "checksum": "bf7badf7e248e0ecf465d33c2f5aeec774209227",
         "checkfunc": tarball_version,
@@ -527,9 +523,8 @@ build.add(
     build_func=build_gdbm,
     download={
         "url": "https://ftp.gnu.org/gnu/gdbm/gdbm-{version}.tar.gz",
-        "fallback_url": "https://woz.io/relenv/dependencies/gdbm-{version}.tar.gz",
-        "version": "1.24",
-        "checksum": "7bd455f28c9e4afacc042e0c712aac1b2391fef2",
+        "version": "1.25",
+        "checksum": "d55bdf2bb5f92f80006166dd8a8323cb2a428bd1",
         "checkfunc": tarball_version,
     },
 )
@@ -539,7 +534,6 @@ build.add(
     build_func=build_ncurses,
     download={
         "url": "https://ftp.gnu.org/pub/gnu/ncurses/ncurses-{version}.tar.gz",
-        "fallback_url": "https://woz.io/relenv/dependencies/ncurses-{version}.tar.gz",
         # XXX: Need to work out tinfo linkage
         # "version": "6.5",
         # "checksum": "cde3024ac3f9ef21eaed6f001476ea8fffcaa381",
@@ -554,9 +548,8 @@ build.add(
     build_libffi,
     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.6",
-        "checksum": "19251dfee520dff42acefe36bfe76d7168071e01",
+        "version": "3.4.8",
+        "checksum": "6930b77aebe2465a8e1a8617c4c9a8fa3199b256",
         "checkfunc": github_version,
         "checkurl": "https://github.com/libffi/libffi/releases/",
     },
@@ -567,7 +560,6 @@ build.add(
     build_zlib,
     download={
         "url": "https://zlib.net/fossils/zlib-{version}.tar.gz",
-        "fallback_url": "https://woz.io/relenv/dependencies/zlib-{version}.tar.gz",
         "version": "1.3.1",
         "checksum": "f535367b1a11e2f9ac3bec723fb007fbc0d189e5",
         "checkfunc": tarball_version,
@@ -578,7 +570,6 @@ build.add(
     "uuid",
     download={
         "url": "https://sourceforge.net/projects/libuuid/files/libuuid-{version}.tar.gz",
-        "fallback_url": "https://woz.io/relenv/dependencies/libuuid-{version}.tar.gz",
         "version": "1.0.3",
         "checksum": "46eaedb875ae6e63677b51ec583656199241d597",
         "checkfunc": uuid_version,
@@ -591,7 +582,6 @@ build.add(
     wait_on=["openssl"],
     download={
         "url": "https://kerberos.org/dist/krb5/{version}/krb5-{version}.tar.gz",
-        "fallback_url": "https://woz.io/relenv/dependencies/krb5-{version}.tar.gz",
         "version": "1.21",
         "checksum": "e2ee531443122376ac8b62b3848d94376f646089",
         "checkfunc": krb_version,
@@ -605,7 +595,6 @@ build.add(
     wait_on=["ncurses"],
     download={
         "url": "https://ftp.gnu.org/gnu/readline/readline-{version}.tar.gz",
-        "fallback_url": "https://woz.io/relenv/dependencies/readline-{version}.tar.gz",
         "version": "8.2.13",
         "checksum": "5ffb6a334c2422acbe8f4d2cb11e345265c8d930",
         "checkfunc": tarball_version,
@@ -620,7 +609,6 @@ build.add(
     download={
         "url": "https://sourceforge.net/projects/libtirpc/files/libtirpc-{version}.tar.bz2",
         # "url": "https://downloads.sourceforge.net/projects/libtirpc/files/libtirpc-{version}.tar.bz2",
-        "fallback_url": "https://woz.io/relenv/dependencies/libtirpc-{version}.tar.bz2",
         "version": "1.3.4",
         "checksum": "63c800f81f823254d2706637bab551dec176b99b",
         "checkfunc": tarball_version,
@@ -647,9 +635,8 @@ build.add(
     ],
     download={
         "url": "https://www.python.org/ftp/python/{version}/Python-{version}.tar.xz",
-        "fallback_url": "https://woz.io/relenv/dependencies/Python-{version}.tar.xz",
         "version": build.version,
-        "checksum": "f498fd8921e3c37e6aded9acb11ed23c8daa0bbe",
+        "checksum": "d31d548cd2c5ca2ae713bebe346ba15e8406633a",
         "checkfunc": python_version,
         "checkurl": "https://www.python.org/ftp/python/",
     },
@@ -666,16 +653,16 @@ build.add(
 )
 
 build = build.copy(
-    version="3.11.10", checksum="eb0ee5c84407445809a556592008cfc1867a39bc"
+    version="3.11.11", checksum="acf539109b024d3c5f1fc63d6e7f08cd294ba56d"
 )
 builds.add("linux", builder=build)
 
 build = build.copy(
-    version="3.12.7", checksum="5a760bbc42c67f1a0aef5bcf7c329348fb88448b"
+    version="3.12.9", checksum="465d8a664e63dc5aa1f0d90cd1d0000a970ee2fb"
 )
 builds.add("linux", builder=build)
 
 build = build.copy(
-    version="3.13.0", checksum="0f71dce4a3251460985a944bbd1d1b7db1660a91"
+    version="3.13.3", checksum="f26085cf12daef7b60b8a6fe93ef988b9a094aea"
 )
 builds.add("linux", builder=build)

relenv/build/windows.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2022-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 The windows build process.
@@ -60,7 +60,9 @@ def build_python(env, dirs, logfp):
         plat,
         "--no-tkinter",
     ]
+    log.info("Start PCbuild")
     runcmd(cmd, env=env, stderr=logfp, stdout=logfp)
+    log.info("PCbuild finished")
 
     # This is where build.bat puts everything
     # TODO: For now we'll only support 64bit
@@ -128,7 +130,7 @@ def build_python(env, dirs, logfp):
     )
 
 
-build = builds.add("win32", populate_env=populate_env, version="3.10.15")
+build = builds.add("win32", populate_env=populate_env, version="3.10.17")
 
 build.add(
     "python",
@@ -136,7 +138,7 @@ build.add(
     download={
         "url": "https://www.python.org/ftp/python/{version}/Python-{version}.tar.xz",
         "version": build.version,
-        "checksum": "f498fd8921e3c37e6aded9acb11ed23c8daa0bbe",
+        "checksum": "d31d548cd2c5ca2ae713bebe346ba15e8406633a",
     },
 )
 
@@ -153,7 +155,6 @@ def finalize(env, dirs, logfp):
     :type logfp: file
     """
     # Lay down site customize
-    bindir = pathlib.Path(dirs.prefix) / "Scripts"
     sitepackages = dirs.prefix / "Lib" / "site-packages"
 
     install_runtime(sitepackages)
@@ -164,11 +165,12 @@ def finalize(env, dirs, logfp):
 
     def runpip(pkg):
         # XXX Support cross pip installs on windows
-        pip = bindir / "pip3.exe"
         env = os.environ.copy()
         target = None
         cmd = [
-            str(pip),
+            str(python),
+            "-m",
+            "pip",
             "install",
             str(pkg),
         ]
@@ -210,16 +212,16 @@ build.add(
 )
 
 build = build.copy(
-    version="3.11.10", checksum="eb0ee5c84407445809a556592008cfc1867a39bc"
+    version="3.11.11", checksum="acf539109b024d3c5f1fc63d6e7f08cd294ba56d"
 )
 builds.add("win32", builder=build)
 
 build = build.copy(
-    version="3.12.7", checksum="5a760bbc42c67f1a0aef5bcf7c329348fb88448b"
+    version="3.12.9", checksum="465d8a664e63dc5aa1f0d90cd1d0000a970ee2fb"
 )
 builds.add("win32", builder=build)
 
 build = build.copy(
-    version="3.13.0", checksum="0f71dce4a3251460985a944bbd1d1b7db1660a91"
+    version="3.13.3", checksum="f26085cf12daef7b60b8a6fe93ef988b9a094aea"
 )
 builds.add("win32", builder=build)