diff --git a/extra/glib/build b/extra/glib/build index 76b06522..5132bad6 100755 --- a/extra/glib/build +++ b/extra/glib/build @@ -1,6 +1,7 @@ #!/bin/sh -e -patch -p1 < musl.patch +# static_assert is not defined in C99. +export CFLAGS="$CFLAGS -std=gnu11" # Remove 'util-linux' dependency. sed 's/libmount_dep.found()/false/' meson.build > _ diff --git a/extra/glib/checksums b/extra/glib/checksums index b064c818..3a9e9a3d 100644 --- a/extra/glib/checksums +++ b/extra/glib/checksums @@ -1,2 +1 @@ -5f3ee36e34f4aaab393c3e3dc46fb01b32f7ead6c88d41d7f20d88a49cdef1d9 -5476b0c742dc348812de45f0a26dc9f471c432e56aec2c2074a23a8488c1caf6 +df1a2b841667d6b48b2ef6969ebda4328243829f6e45866726f806f90f64eead diff --git a/extra/glib/patches/musl.patch b/extra/glib/patches/musl.patch deleted file mode 100644 index 654e9303..00000000 --- a/extra/glib/patches/musl.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/glib/gmain.c b/glib/gmain.c -index fcf0b3dba..af1ed66b4 100644 ---- a/glib/gmain.c -+++ b/glib/gmain.c -@@ -73,6 +73,12 @@ - #include - #include - #include /* P_PIDFD */ -+#ifndef W_EXITCODE -+#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) -+#endif -+#ifndef W_STOPCODE -+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f) -+#endif - #endif /* HAVE_PIDFD */ - - #ifdef G_OS_WIN32 diff --git a/extra/glib/sources b/extra/glib/sources index c5fbd0c2..defa65c7 100644 --- a/extra/glib/sources +++ b/extra/glib/sources @@ -1,2 +1 @@ https://download.gnome.org/sources/glib/MAJOR.MINOR/glib-VERSION.tar.xz -patches/musl.patch diff --git a/extra/glib/version b/extra/glib/version index 6ba906e5..8bef7d56 100644 --- a/extra/glib/version +++ b/extra/glib/version @@ -1 +1 @@ -2.73.2 1 +2.73.3 1