diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-07-08 23:18:16 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-10 22:40:12 +0100 |
| commit | 534287a00b7e4d74f0dbab0524738a77801682ee (patch) | |
| tree | c358deff3d012bc9ff3faa68299874e1402deffe | |
| parent | a83aac8b7717aac48dbb8f6803a015c0098e6d31 (diff) | |
| download | openembedded-core-contrib-534287a00b7e4d74f0dbab0524738a77801682ee.tar.gz | |
glib-2.0: Fix signature of close_range
glibc 2.34 provides this function which exposes a latest issue w.r.t.
function parameters
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch new file mode 100644 index 0000000000..6ff25fc535 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch @@ -0,0 +1,29 @@ +From b71117d89434db83d34bc1b981ca03d4be299576 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +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 + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2180] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + 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 +-- +2.32.0 diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb index 62c8d49464..cbce6eae61 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb @@ -18,6 +18,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ file://time-test.patch \ + file://0001-correctly-use-3-parameters-for-close_range.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" |