Skip to content

Commit fe1baf1

Browse files
committed
Switch from musllinux_1_1 to musllinux_1_2
The `musllinux_1_1` image is past end of life. Switch to `musllinux_1_2` instead. Signed-off-by: Matt Wozniski <[email protected]>
1 parent 70cc44e commit fe1baf1

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

news/229.removal.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
We no longer provide x86-64 musllinux_1_1 wheels. Previously they were provided for Python 3.7 through 3.13, now we provide musllinux_1_2 wheels for those Python versions instead. The manylinux project dropped support for musllinux_1_1 on November 1st, 2024.

pyproject.toml

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ underlines = "-~"
4646
build = ["cp38-*", "cp39-*", "cp310-*", "cp311-*"]
4747
manylinux-x86_64-image = "manylinux2014"
4848
manylinux-i686-image = "manylinux2014"
49-
musllinux-x86_64-image = "musllinux_1_1"
49+
musllinux-x86_64-image = "musllinux_1_2"
5050
skip = "*-musllinux_aarch64"
5151

5252
[tool.cibuildwheel.linux]
@@ -70,34 +70,23 @@ before-all = [
7070
# dependency of elfutils.
7171
"apk del gettext-dev glib-dev",
7272

73-
# Build musl-fts from source. This is a build dependency of elfutils, but
74-
# isn't in the Alpine repos of the musllinux_1_1 image. The build steps come
75-
# from https://git.alpinelinux.org/aports/tree/main/musl-fts/APKBUILD
76-
# Setting PATH before calling boostrap.sh fixes an automake failure. I think
77-
# the failure may be caused by a different pkg-config in /usr/local/bin.
78-
"cd /",
79-
"apk add --update automake autoconf libtool",
80-
"VERS=1.2.7",
81-
"curl -L https://github.com/void-linux/musl-fts/archive/refs/tags/v$VERS.tar.gz > ./musl-fts.tar.gz",
82-
"tar -xf musl-fts.tar.gz",
83-
"cd musl-fts-$VERS",
84-
"PATH=/usr/bin:/bin ./bootstrap.sh",
85-
"CFLAGS=-fPIC ./configure --prefix=/usr",
86-
"make install",
87-
8873
# Build the latest elfutils from source. The build steps come from
8974
# https://git.alpinelinux.org/aports/tree/main/elfutils, and the need to
9075
# set the FNM_EXTMATCH macro to get the build to succeed is seen here:
9176
# https://git.alpinelinux.org/aports/tree/main/elfutils/musl-macros.patch
9277
"cd /",
93-
"apk add --update argp-standalone bison bsd-compat-headers bzip2-dev flex-dev libtool linux-headers musl-libintl musl-obstack-dev xz-dev zlib-dev zstd-dev",
78+
"apk add --update argp-standalone bison bsd-compat-headers bzip2-dev flex-dev libtool linux-headers musl-fts-dev musl-libintl musl-obstack-dev xz-dev zlib-dev zstd-dev",
9479
"VERS=0.189",
9580
"curl https://sourceware.org/elfutils/ftp/$VERS/elfutils-$VERS.tar.bz2 > ./elfutils.tar.bz2",
9681
"tar -xf elfutils.tar.bz2",
9782
"cd elfutils-$VERS",
9883
"patch libdwfl/dwfl_segment_report_module.c < {package}/build_scripts/elfutils_contiguous_segments.diff",
9984
"CFLAGS='-w -DFNM_EXTMATCH=0' ./configure --prefix=/usr --disable-nls --disable-libdebuginfod --disable-debuginfod --with-zstd",
100-
"make install"
85+
"make install",
86+
87+
# Reinstall libintl, as the Python interpreter requires it
88+
"apk del musl-libintl",
89+
"apk add libintl",
10190
]
10291

10392
[tool.coverage.run]

0 commit comments

Comments
 (0)