Skip to content

Commit

Permalink
linux: fix vendor build library bundling
Browse files Browse the repository at this point in the history
auditwheel 4.0 changed the internal data format used by linux-delocate-deps.py
  • Loading branch information
rcoup committed Aug 25, 2021
1 parent bc39296 commit df4186a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 14 deletions.
2 changes: 1 addition & 1 deletion platforms/linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:experimental
FROM ghcr.io/pyca/cryptography-manylinux2010:x86_64
FROM quay.io/pypa/manylinux2014_x86_64

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

Expand Down
2 changes: 1 addition & 1 deletion vendor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ build-Linux:
-v /build \
-e CCACHE_DIR=/root/.cache/ccache \
-e CCACHE_COMPRESS \
ghcr.io/pyca/cryptography-manylinux2010:x86_64 \
quay.io/pypa/manylinux2014_x86_64 \
bash -c '/src/build-manylinux.sh /src/$(VENDOR) ${LINUX_DEBUG_CMD_$(LINUX_DEBUG)}'

tar czf $(vendor-Linux-archive) -C $(VENDOR) env wheelhouse
Expand Down
11 changes: 0 additions & 11 deletions vendor/build-manylinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,6 @@ if [ -n "$CCACHE_DIR" ]; then
export PATH=/usr/lib64/ccache:${PATH}
fi

echo ">>> Building patched patchelf"
# https://github.com/pypa/auditwheel/issues/159
mkdir /patchelf
curl -sL https://github.com/nvictus/patchelf/archive/d7483d92cfd614e06839c18d2fa194b88ff777a2.tar.gz | tar xz -C /patchelf --strip-components=1
pushd /patchelf
./bootstrap.sh
./configure
make
make install
popd

echo ">>> Python: $(command -v python3.7)"

echo ">>> Setting up /build ..."
Expand Down
2 changes: 1 addition & 1 deletion vendor/linux-delocate-deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from auditwheel.policy.external_references import lddtree_external_references


POLICY = "manylinux2010_x86_64"
POLICY = "manylinux_2_17_x86_64" # ie: manylinux2014_x86_64


def main():
Expand Down

0 comments on commit df4186a

Please sign in to comment.