Skip to content

Commit de4c587

Browse files
committed
Switch from musllinux_1_1 wheels to musllinux_1_2
Signed-off-by: Matt Wozniski <[email protected]>
1 parent 8aee6c5 commit de4c587

File tree

1 file changed

+6
-17
lines changed

1 file changed

+6
-17
lines changed

pyproject.toml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ build = ["cp38-*", "cp39-*", "cp310-*", "cp311-*"]
6565
skip = "*musllinux*{i686,aarch64}*"
6666
manylinux-x86_64-image = "manylinux2014"
6767
manylinux-i686-image = "manylinux2014"
68-
musllinux-x86_64-image = "musllinux_1_1"
68+
musllinux-x86_64-image = "musllinux_1_2"
6969

7070
[tool.cibuildwheel.linux]
7171
before-all = [
@@ -142,34 +142,23 @@ before-all = [
142142
# dependency of elfutils.
143143
"apk del gettext-dev glib-dev",
144144

145-
# Build musl-fts from source. This is a build dependency of elfutils, but
146-
# isn't in the Alpine repos of the musllinux_1_1 image. The build steps come
147-
# from https://git.alpinelinux.org/aports/tree/main/musl-fts/APKBUILD
148-
# Setting PATH before calling boostrap.sh fixes an automake failure. I think
149-
# the failure may be caused by a different pkg-config in /usr/local/bin.
150-
"cd /",
151-
"apk add --update automake autoconf libtool",
152-
"VERS=1.2.7",
153-
"curl -L https://github.com/void-linux/musl-fts/archive/refs/tags/v$VERS.tar.gz > ./musl-fts.tar.gz",
154-
"tar -xf musl-fts.tar.gz",
155-
"cd musl-fts-$VERS",
156-
"PATH=/usr/bin:/bin ./bootstrap.sh",
157-
"CFLAGS=-fPIC ./configure",
158-
"make install",
159-
160145
# Build the latest elfutils from source. The build steps come from
161146
# https://git.alpinelinux.org/aports/tree/main/elfutils, and the need to
162147
# set the FNM_EXTMATCH macro to get the build to succeed is seen here:
163148
# https://git.alpinelinux.org/aports/tree/main/elfutils/musl-macros.patch
164149
"cd /",
165-
"apk add --update argp-standalone bison bsd-compat-headers bzip2-dev curl-dev flex-dev libtool linux-headers musl-libintl musl-obstack-dev xz-dev zlib-dev zstd-dev",
150+
"apk add --update argp-standalone bison bsd-compat-headers bzip2-dev curl-dev flex-dev libtool linux-headers musl-fts-dev musl-libintl musl-obstack-dev xz-dev zlib-dev zstd-dev",
166151
"VERS=0.191",
167152
"curl https://sourceware.org/elfutils/ftp/$VERS/elfutils-$VERS.tar.bz2 > ./elfutils.tar.bz2",
168153
"tar -xf elfutils.tar.bz2",
169154
"cd elfutils-$VERS",
170155
"CFLAGS='-Wno-error -DFNM_EXTMATCH=0 -g -O3' CXXFLAGS='-Wno-error -g -O3' ./configure --enable-libdebuginfod --disable-debuginfod --disable-nls --with-zstd",
171156
"make install",
172157

158+
# Reinstall libintl, as the Python interpreter requires it
159+
"apk del musl-libintl",
160+
"apk add libintl",
161+
173162
# Install Memray's other build and test dependencies
174163
"apk add --update libunwind-dev lz4-dev"
175164
]

0 commit comments

Comments
 (0)