From d888c344d8287ad760a2f44d94c0a45b9e7562eb Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 18 Aug 2021 16:52:29 +0000 Subject: [PATCH] glib: Fix FTBFS with glibc 2.34 Signed-off-by: Michael Tremer --- lfs/glib | 1 + src/patches/glib-2.69-close_range.patch | 29 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/patches/glib-2.69-close_range.patch diff --git a/lfs/glib b/lfs/glib index cbf666f703..fb4d7338fe 100644 --- a/lfs/glib +++ b/lfs/glib @@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glib-2.69-close_range.patch $(UPDATE_AUTOMAKE) cd $(DIR_APP) && meson --prefix=/usr \ --sysconfdir=/etc \ diff --git a/src/patches/glib-2.69-close_range.patch b/src/patches/glib-2.69-close_range.patch new file mode 100644 index 0000000000..ca77ec3637 --- /dev/null +++ b/src/patches/glib-2.69-close_range.patch @@ -0,0 +1,29 @@ +From b71117d89434db83d34bc1b981ca03d4be299576 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 8 Jul 2021 17:26:43 -0700 +Subject: [PATCH] correctly use 3 parameters for close_range + +libc implementation has 3 parameter e.g. +https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html + +Signed-off-by: Khem Raj +--- + glib/gspawn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/gspawn.c b/glib/gspawn.c +index 899647c2f..3073a10a4 100644 +--- a/glib/gspawn.c ++++ b/glib/gspawn.c +@@ -1520,7 +1520,7 @@ safe_closefrom (int lowfd) + * + * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, + * fall back to safe_fdwalk(). */ +- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS) ++ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) + #endif /* HAVE_CLOSE_RANGE */ + (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); + #endif +-- +GitLab + -- 2.39.5