From 5b4f48422dbf14809e41580457c11dec87993f33 Mon Sep 17 00:00:00 2001 From: twangboy Date: Wed, 24 Sep 2025 12:47:20 -0600 Subject: [PATCH 1/6] Update LZMA to 5.8.2 --- relenv/build/darwin.py | 4 ++-- relenv/build/linux.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/relenv/build/darwin.py b/relenv/build/darwin.py index 11964697..f8b2742a 100644 --- a/relenv/build/darwin.py +++ b/relenv/build/darwin.py @@ -88,8 +88,8 @@ def build_python(env, dirs, logfp): "XZ", download={ "url": "http://tukaani.org/xz/xz-{version}.tar.gz", - "version": "5.6.2", - "checksum": "0d6b10e4628fe08e19293c65e8dbcaade084a083", + "version": "5.8.1", + "checksum": "ed4d5589c4cfe84e1697bd02a9954b76af336931", }, ) diff --git a/relenv/build/linux.py b/relenv/build/linux.py index 7b543a8a..7285c5c3 100644 --- a/relenv/build/linux.py +++ b/relenv/build/linux.py @@ -489,7 +489,6 @@ def build_python(env, dirs, logfp): }, ) - build.add( "openssl-fips-module", build_func=build_openssl_fips, @@ -519,8 +518,8 @@ def build_python(env, dirs, logfp): "XZ", download={ "url": "http://tukaani.org/xz/xz-{version}.tar.gz", - "version": "5.6.2", - "checksum": "0d6b10e4628fe08e19293c65e8dbcaade084a083", + "version": "5.8.1", + "checksum": "ed4d5589c4cfe84e1697bd02a9954b76af336931", "checkfunc": tarball_version, }, ) From 6af5ff079567be24e913e4690f9ea2420a2f470c Mon Sep 17 00:00:00 2001 From: twangboy Date: Wed, 24 Sep 2025 15:02:50 -0600 Subject: [PATCH 2/6] Update lzma on Windows --- relenv/build/windows.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/relenv/build/windows.py b/relenv/build/windows.py index 861a1337..90280730 100644 --- a/relenv/build/windows.py +++ b/relenv/build/windows.py @@ -92,6 +92,8 @@ def build_python(env, dirs, logfp): ]: override_dependency(dirs.source, r"sqlite-\d+.\d+.\d+.\d+", "sqlite-3.50.4.0") + override_dependency(dirs.source, r"xz-\d+.\d+.\d+", "xz-5.6.2") + arch_to_plat = { "amd64": "x64", "x86": "win32", From fe0baa48136640f68ebb1994e2ff40e804e7d435 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 1 Oct 2025 17:00:09 -0700 Subject: [PATCH 3/6] Add debug step listing data dir --- .github/workflows/build-native-action.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-native-action.yml b/.github/workflows/build-native-action.yml index e609642f..2a25f943 100644 --- a/.github/workflows/build-native-action.yml +++ b/.github/workflows/build-native-action.yml @@ -89,6 +89,10 @@ jobs: path: ${{ github.workspace }}/download key: ${{ github.run_id }}-dependencies + - name: List downloads + run: | + tree $RELENV_DATA + - name: Build run: | venv/bin/python3 -m relenv build --no-pretty --arch=${{ matrix.target }} --python=${{ matrix.version }} From 082ff4744e7e0f0f1615311d65dfc0c8707d38e5 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 1 Oct 2025 17:49:11 -0700 Subject: [PATCH 4/6] Remove invalid cflag --- relenv/build/darwin.py | 1 - 1 file changed, 1 deletion(-) diff --git a/relenv/build/darwin.py b/relenv/build/darwin.py index f8b2742a..1b032462 100644 --- a/relenv/build/darwin.py +++ b/relenv/build/darwin.py @@ -28,7 +28,6 @@ def populate_env(env, dirs): env["LDFLAGS"] = " ".join(ldflags).format(prefix=dirs.prefix) env["MACOSX_DEPLOYMENT_TARGET"] = MACOS_DEVELOPMENT_TARGET cflags = [ - "-L{prefix}/lib", "-I{prefix}/include", "-I{prefix}/include/readline", ] From fb5f11e5017b21c4c5cc9c9e933269792f0d13dd Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 1 Oct 2025 17:49:34 -0700 Subject: [PATCH 5/6] Only list the downloads directory. --- .github/workflows/build-native-action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-native-action.yml b/.github/workflows/build-native-action.yml index 2a25f943..e6306b3b 100644 --- a/.github/workflows/build-native-action.yml +++ b/.github/workflows/build-native-action.yml @@ -91,7 +91,7 @@ jobs: - name: List downloads run: | - tree $RELENV_DATA + tree $RELENV_DATA/download - name: Build run: | From 00d408f53278f4d105d331e88e201db5311b4065 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 1 Oct 2025 17:50:15 -0700 Subject: [PATCH 6/6] Gate the dependency upgrade until we sort out the SBOM stuff --- relenv/build/windows.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/relenv/build/windows.py b/relenv/build/windows.py index 90280730..a92425ff 100644 --- a/relenv/build/windows.py +++ b/relenv/build/windows.py @@ -91,8 +91,7 @@ def build_python(env, dirs, logfp): "3.11", ]: override_dependency(dirs.source, r"sqlite-\d+.\d+.\d+.\d+", "sqlite-3.50.4.0") - - override_dependency(dirs.source, r"xz-\d+.\d+.\d+", "xz-5.6.2") + override_dependency(dirs.source, r"xz-\d+.\d+.\d+", "xz-5.6.2") arch_to_plat = { "amd64": "x64",