Skip to content

Commit a676470

Browse files
committed
linux: fix vendor build library bundling
auditwheel 4.0 changed the internal data format used by linux-delocate-deps.py
1 parent 6dedd1d commit a676470

File tree

4 files changed

+3
-14
lines changed

4 files changed

+3
-14
lines changed

platforms/linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax = docker/dockerfile:experimental
2-
FROM ghcr.io/pyca/cryptography-manylinux2010:x86_64
2+
FROM quay.io/pypa/manylinux2014_x86_64
33

44
ENV PATH=/opt/python/cp37-cp37m/bin:${PATH}
55

vendor/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ build-Linux:
353353
-v /build \
354354
-e CCACHE_DIR=/root/.cache/ccache \
355355
-e CCACHE_COMPRESS \
356-
ghcr.io/pyca/cryptography-manylinux2010:x86_64 \
356+
quay.io/pypa/manylinux2014_x86_64 \
357357
bash -c '/src/build-manylinux.sh /src/$(VENDOR) ${LINUX_DEBUG_CMD_$(LINUX_DEBUG)}'
358358

359359
tar czf $(vendor-Linux-archive) -C $(VENDOR) env wheelhouse

vendor/build-manylinux.sh

-11
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,6 @@ if [ -n "$CCACHE_DIR" ]; then
2020
export PATH=/usr/lib64/ccache:${PATH}
2121
fi
2222

23-
echo ">>> Building patched patchelf"
24-
# https://github.com/pypa/auditwheel/issues/159
25-
mkdir /patchelf
26-
curl -sL https://github.com/nvictus/patchelf/archive/d7483d92cfd614e06839c18d2fa194b88ff777a2.tar.gz | tar xz -C /patchelf --strip-components=1
27-
pushd /patchelf
28-
./bootstrap.sh
29-
./configure
30-
make
31-
make install
32-
popd
33-
3423
echo ">>> Python: $(command -v python3.7)"
3524

3625
echo ">>> Setting up /build ..."

vendor/linux-delocate-deps.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from auditwheel.policy.external_references import lddtree_external_references
1010

1111

12-
POLICY = "manylinux2010_x86_64"
12+
POLICY = "manylinux_2_17_x86_64" # ie: manylinux2014_x86_64
1313

1414

1515
def main():

0 commit comments

Comments
 (0)