Skip to content

Commit 5dd03ee

Browse files
committed
Build manylinux2014 wheels instead of manylinux2010
manylinux2010 has been EOL since August 2022; see pypa/manylinux#1281. In particular, the manylinux2010 image wasn't updated with Python 3.11. Update scripts/build_dist.sh to use manylinux2014 and drop some CentOS 6 workarounds from scripts/build_manylinux_in_docker.sh. If someone really wants manylinux2010, we can probably build both, but none of the popular packages I checked (NumPy, SciPy, cryptography, charset-normalizer) do this. Signed-off-by: Omar Sandoval <osandov@osandov.com>
1 parent 69d3ce5 commit 5dd03ee

File tree

2 files changed

+4
-23
lines changed

2 files changed

+4
-23
lines changed

scripts/build_dists.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -eux
99
SDIST=dist/drgn-"$("$PYTHON" setup.py --version)".tar.gz
1010

1111
${DOCKER=docker} run -it \
12-
--env PLAT=manylinux2010_x86_64 \
12+
--env PLAT=manylinux2014_x86_64 \
1313
--env SDIST="$SDIST" \
1414
--env OWNER="$(id -u):$(id -g)" \
1515
--volume "$(pwd)":/io:ro \
@@ -18,5 +18,5 @@ ${DOCKER=docker} run -it \
1818
--hostname drgn \
1919
--rm \
2020
--pull always \
21-
quay.io/pypa/manylinux2010_x86_64 \
21+
quay.io/pypa/manylinux2014_x86_64 \
2222
./scripts/build_manylinux_in_docker.sh

scripts/build_manylinux_in_docker.sh

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,7 @@ libkdumpfile_url=https://github.com/ptesarik/libkdumpfile/releases/download/v$li
4343
mkdir /tmp/libkdumpfile
4444
cd /tmp/libkdumpfile
4545
curl -L "$libkdumpfile_url" | tar -xz --strip-components=1
46-
# This file is missing an include of limits.h which it accidentally gets from
47-
# zlib.h via zconf.h, but only since zlib 1.2.7. CentOS 6 has 1.2.3.
48-
patch -p1 << "EOF"
49-
diff --git a/src/kdumpfile/util.c b/src/kdumpfile/util.c
50-
index 4fb2960..14e1ce3 100644
51-
--- a/src/kdumpfile/util.c
52-
+++ b/src/kdumpfile/util.c
53-
@@ -38,6 +38,7 @@
54-
#include <stdio.h>
55-
#include <stdarg.h>
56-
#include <errno.h>
57-
+#include <limits.h>
58-
59-
#if USE_ZLIB
60-
# include <zlib.h>
61-
EOF
62-
# z_const was added in zlib 1.2.5.2.
63-
CPPFLAGS="-Dz_const=const" ./configure --with-libzstd --with-lzo --with-snappy --with-zlib --without-python
46+
./configure --with-libzstd --with-lzo --with-snappy --with-zlib --without-python
6447
make -j$(($(nproc) + 1))
6548
make install
6649

@@ -76,9 +59,7 @@ python_supported() {
7659

7760
for pybin in /opt/python/cp*/bin; do
7861
if python_supported "$pybin/python"; then
79-
# static_assert was added to assert.h in glibc 2.16, but CentOS
80-
# 6 has 2.12.
81-
CPPFLAGS="-Dstatic_assert=_Static_assert" "$pybin/pip" wheel . --no-deps -w /tmp/wheels/
62+
"$pybin/pip" wheel . --no-deps -w /tmp/wheels/
8263
fi
8364
done
8465

0 commit comments

Comments
 (0)