From df4186a15791e2f9ca76c1d9ed38cc1ef32e334e Mon Sep 17 00:00:00 2001
From: rcoup <robert.coup@koordinates.com>
Date: Thu, 26 Aug 2021 00:25:40 +0100
Subject: [PATCH] linux: fix vendor build library bundling

auditwheel 4.0 changed the internal data format used by linux-delocate-deps.py
---
 platforms/linux/Dockerfile    |  2 +-
 vendor/Makefile               |  2 +-
 vendor/build-manylinux.sh     | 11 -----------
 vendor/linux-delocate-deps.py |  2 +-
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/platforms/linux/Dockerfile b/platforms/linux/Dockerfile
index 156a91c1c..50199326f 100644
--- a/platforms/linux/Dockerfile
+++ b/platforms/linux/Dockerfile
@@ -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}
 
diff --git a/vendor/Makefile b/vendor/Makefile
index e71bb9b0d..aaa753ec3 100644
--- a/vendor/Makefile
+++ b/vendor/Makefile
@@ -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
diff --git a/vendor/build-manylinux.sh b/vendor/build-manylinux.sh
index 9e0ced653..2aded8ef1 100755
--- a/vendor/build-manylinux.sh
+++ b/vendor/build-manylinux.sh
@@ -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 ..."
diff --git a/vendor/linux-delocate-deps.py b/vendor/linux-delocate-deps.py
index 7c67fd8b6..99b7229ed 100755
--- a/vendor/linux-delocate-deps.py
+++ b/vendor/linux-delocate-deps.py
@@ -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():