diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2023-06-07 11:25:16 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-09 13:55:20 +0100 |
commit | 10087741166b408c8c19a6e8c3c13439ba0be947 (patch) | |
tree | 5599bc7838d9a39caf53f0dfa814357148ade3fa /meta/recipes-core/glib-2.0 | |
parent | 03b693fd48bd8f8ccaada4e2d15f36a8c88817d8 (diff) | |
download | poky-10087741166b408c8c19a6e8c3c13439ba0be947.tar.gz |
glib-2.0: upgrade 2.76.2 -> 2.76.3
(From OE-Core rev: 260bd5c7e69968eb2f58582f309fcadceca50bd2)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch | 36 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.76.2.bb) | 3 |
2 files changed, 1 insertions, 38 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch deleted file mode 100644 index db63cfd91e..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From edd1e47f107410d9e4edb691335410026ae5a534 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
3 | Date: Tue, 25 Apr 2023 20:02:31 +0200 | ||
4 | Subject: [PATCH] Avoid having g_futex_simple() inadvertently modify errno | ||
5 | |||
6 | If both __NR_futex and __NR_futex_time64 are defined, g_futex_simple() | ||
7 | will first call futex_time64(). If that fails with ENOSYS, then | ||
8 | futex_time() is called instead. However, errno was not saved and | ||
9 | restored in this case, which would result in g_futex_simple() | ||
10 | returning with errno set to ENOSYS, even if futex_time() succeeded. | ||
11 | |||
12 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/edd1e47f107410d9e4edb691335410026ae5a534] | ||
13 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
14 | --- | ||
15 | glib/gthreadprivate.h | 6 +++++- | ||
16 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h | ||
19 | index 9c847e039..74d37ba32 100644 | ||
20 | --- a/glib/gthreadprivate.h | ||
21 | +++ b/glib/gthreadprivate.h | ||
22 | @@ -65,9 +65,13 @@ struct _GRealThread | ||
23 | #define g_futex_simple(uaddr, futex_op, ...) \ | ||
24 | G_STMT_START \ | ||
25 | { \ | ||
26 | + int saved_errno = errno; \ | ||
27 | int res = syscall (__NR_futex_time64, uaddr, (gsize) futex_op, __VA_ARGS__); \ | ||
28 | if (res < 0 && errno == ENOSYS) \ | ||
29 | - syscall (__NR_futex, uaddr, (gsize) futex_op, __VA_ARGS__); \ | ||
30 | + { \ | ||
31 | + errno = saved_errno; \ | ||
32 | + syscall (__NR_futex, uaddr, (gsize) futex_op, __VA_ARGS__); \ | ||
33 | + } \ | ||
34 | } \ | ||
35 | G_STMT_END | ||
36 | #elif defined(__NR_futex_time64) | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.76.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb index 6a9a5f359c..a60e768836 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.76.2.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb | |||
@@ -14,12 +14,11 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
14 | file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ | 14 | file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ |
15 | file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ | 15 | file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ |
16 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ | 16 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ |
17 | file://0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch \ | ||
18 | file://0001-gio-tests-portal-support-Fix-snap-test-ordering-race.patch \ | 17 | file://0001-gio-tests-portal-support-Fix-snap-test-ordering-race.patch \ |
19 | " | 18 | " |
20 | SRC_URI:append:class-native = " file://relocate-modules.patch" | 19 | SRC_URI:append:class-native = " file://relocate-modules.patch" |
21 | 20 | ||
22 | SRC_URI[sha256sum] = "24f3847857b1d8674cdb0389a36edec0f13c666cd3ce727ecd340eb9da8aca9e" | 21 | SRC_URI[sha256sum] = "c0be444e403d7c3184d1f394f89f0b644710b5e9331b54fa4e8b5037813ad32a" |
23 | 22 | ||
24 | # Find any meson cross files in FILESPATH that are relevant for the current | 23 | # Find any meson cross files in FILESPATH that are relevant for the current |
25 | # build (using siteinfo) and add them to EXTRA_OEMESON. | 24 | # build (using siteinfo) and add them to EXTRA_OEMESON. |