Skip to content

Commit

Permalink
[Meson] Update musl to v1.2.4
Browse files Browse the repository at this point in the history
This update is important because programs built against newer musl may
crash under older musl (e.g. v1.2.2 which Gramine had previously). In
particular, Gramine segfaulted on Alpine 3.18.0 on `/bin/sh` (resolves
to Busybox) apps, because Busybox is built against musl v1.2.4 and
therefore requires the new relocation type `RELR`.

Signed-off-by: Dmitrii Kuvaiskii <dmitrii.kuvaiskii@intel.com>
  • Loading branch information
Dmitrii Kuvaiskii committed Jun 16, 2023
1 parent 54cde12 commit 702ac42
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ if enable_glibc
subproject('glibc-2.36-1')
endif
if enable_musl
subproject('musl-1.2.2')
subproject('musl-1.2.4')
endif

if enable_libgomp
Expand Down
7 changes: 0 additions & 7 deletions subprojects/musl-1.2.2.wrap

This file was deleted.

7 changes: 7 additions & 0 deletions subprojects/musl-1.2.4.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[wrap-file]
directory = musl-1.2.4
source_url = https://musl.libc.org/releases/musl-1.2.4.tar.gz
source_fallback_url = https://packages.gramineproject.io/distfiles/musl-1.2.4.tar.gz
source_filename = musl-1.2.4.tar.gz
source_hash = 7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039
patch_directory = musl-1.2.4
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project('musl', 'c', version: '1.2.2')
project('musl', 'c', version: '1.2.4')

fs = import('fs')

Expand Down Expand Up @@ -31,7 +31,7 @@ musl = custom_target('musl',

input: files([
'configure',
'musl-1.2.2.patch',
'musl-1.2.4.patch',
]),

output: musl_output,
Expand Down

0 comments on commit 702ac42

Please sign in to comment.