third_party/glib: patch musl compat
Change-Id: Ia749d56aba67735dfb861a3e60f1efc9374e9ee1
Reviewed-on: https://review.monogon.dev/c/monogon/+/4299
Reviewed-by: Jan Schär <jan@monogon.tech>
Tested-by: Jenkins CI
diff --git a/MODULE.bazel b/MODULE.bazel
index 26d2a6e..8dd2cbc 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -67,12 +67,21 @@
version = "2.39.3.bcr.1",
)
+bazel_dep(name = "glib")
+single_version_override(
+ module_name = "glib",
+ patch_strip = 1,
+ patches = [
+ "//third_party/glib/patches:musl-compat.patch",
+ ],
+ version = "2.82.2.bcr.5",
+)
+
bazel_dep(name = "zstd", version = "1.5.7")
bazel_dep(name = "gperf", version = "3.1")
bazel_dep(name = "zlib", version = "1.3.1.bcr.6")
bazel_dep(name = "boringssl", version = "0.20250514.0")
bazel_dep(name = "libcap", version = "2.27")
-bazel_dep(name = "glib", version = "2.82.2.bcr.5")
bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_pkg", version = "1.1.0")
diff --git a/third_party/glib/patches/BUILD.bazel b/third_party/glib/patches/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/third_party/glib/patches/BUILD.bazel
diff --git a/third_party/glib/patches/musl-compat.patch b/third_party/glib/patches/musl-compat.patch
new file mode 100644
index 0000000..31206f2
--- /dev/null
+++ b/third_party/glib/patches/musl-compat.patch
@@ -0,0 +1,52 @@
+diff --git a/config.h-linux b/config.h-linux
+--- a/config.h-linux
++++ a/config.h-linux
+@@ -112,22 +112,10 @@
+ #define HAVE_IPV6
+
+ #define HAVE_IP_MREQN 1
+
+-#define HAVE_LANGINFO_ABALTMON 1
+-
+-#define HAVE_LANGINFO_ALTMON 1
+-
+ #define HAVE_LANGINFO_CODESET 1
+
+-#define HAVE_LANGINFO_ERA 1
+-
+-#define HAVE_LANGINFO_OUTDIGIT 1
+-
+-#define HAVE_LANGINFO_TIME 1
+-
+-#define HAVE_LANGINFO_TIME_CODESET 1
+-
+ #define HAVE_LCHMOD 1
+
+ #define HAVE_LCHOWN 1
+
+@@ -258,10 +246,8 @@
+ #define HAVE_STPCPY 1
+
+ #define HAVE_STRCASECMP 1
+
+-#define HAVE_STRERROR_R 1
+-
+ #define HAVE_STRINGS_H 1
+
+ #define HAVE_STRING_H 1
+
+@@ -270,14 +256,8 @@
+ #define HAVE_STRNLEN 1
+
+ #define HAVE_STRSIGNAL 1
+
+-#define HAVE_STRTOD_L 1
+-
+-#define HAVE_STRTOLL_L 1
+-
+-#define HAVE_STRTOULL_L 1
+-
+ #define HAVE_STRUCT_DIRENT_D_TYPE 1
+
+ #define HAVE_STRUCT_STATFS_F_BAVAIL 1
+