diff --git a/.github/workflows/build-native-action.yml b/.github/workflows/build-native-action.yml index e609642f..e6306b3b 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/download + - name: Build run: | venv/bin/python3 -m relenv build --no-pretty --arch=${{ matrix.target }} --python=${{ matrix.version }} diff --git a/relenv/build/darwin.py b/relenv/build/darwin.py index 11964697..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", ] @@ -88,8 +87,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, }, ) diff --git a/relenv/build/windows.py b/relenv/build/windows.py index 861a1337..a92425ff 100644 --- a/relenv/build/windows.py +++ b/relenv/build/windows.py @@ -91,6 +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") arch_to_plat = { "amd64": "x64",