diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-11-14 20:00:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-15 09:38:37 +0000 |
commit | 28ecbe0cc3836eb82d7488db28ce653f6daa843d (patch) | |
tree | c1eb2eda9ad54558f80824a7c712ac2f87dcc018 /meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch | |
parent | f595da926eb6b887a716edd26829ad922dd6861b (diff) | |
download | poky-28ecbe0cc3836eb82d7488db28ce653f6daa843d.tar.gz |
glib-2.0: update 2.72.3 -> 2.74.1
Patches:
0001-Do-not-ignore-return-value-of-write.patch
merged upstream
Enable-more-tests-while-cross-compiling.patch
replaced with a request to upstream to solve
this correctly with meson's exe_wrapper:
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3067
https://github.com/mesonbuild/meson/issues/11029
License-update: formatting
Make needed adjustments to ptests.
Backport a couple of patches to address musl failures.
(From OE-Core rev: cf529411493bc86c4d8d0bb29cbb7b98c23456ad)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch index 59de3fa969..2e1e2313e8 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch | |||
@@ -1,31 +1,31 @@ | |||
1 | From 4f327be49fd6ac5a77da6e48459b37f37a601977 Mon Sep 17 00:00:00 2001 | 1 | From ba1728bc27c88597164957d000b70ec4be6edf28 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 13 Feb 2019 15:32:05 +0100 | 3 | Date: Wed, 13 Feb 2019 15:32:05 +0100 |
4 | Subject: [PATCH] Set host_machine correctly when building with mingw32 | 4 | Subject: [PATCH] Set host_machine correctly when building with mingw32 |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
8 | --- | 9 | --- |
9 | gio/tests/meson.build | 8 ++++---- | 10 | gio/tests/meson.build | 8 ++++---- |
10 | glib/tests/meson.build | 2 +- | 11 | glib/tests/meson.build | 2 +- |
11 | meson.build | 3 +++ | 12 | meson.build | 3 +++ |
12 | tests/meson.build | 2 +- | 13 | 3 files changed, 8 insertions(+), 5 deletions(-) |
13 | 4 files changed, 9 insertions(+), 6 deletions(-) | ||
14 | 14 | ||
15 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build | 15 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build |
16 | index abe676767c60..34b347815308 100644 | 16 | index f644aa2..64a8684 100644 |
17 | --- a/gio/tests/meson.build | 17 | --- a/gio/tests/meson.build |
18 | +++ b/gio/tests/meson.build | 18 | +++ b/gio/tests/meson.build |
19 | @@ -27,7 +27,7 @@ if build_machine.system() == 'linux' | 19 | @@ -29,7 +29,7 @@ endif |
20 | endif # libutil.length() > 0 | 20 | |
21 | endif # build_machine.system() == 'linux' | 21 | test_cpp_args = test_c_args |
22 | 22 | ||
23 | -if host_machine.system() == 'windows' | 23 | -if host_machine.system() == 'windows' |
24 | +if host_system == 'windows' | 24 | +if host_system == 'windows' |
25 | common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] | 25 | common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] |
26 | endif | 26 | endif |
27 | 27 | ||
28 | @@ -176,7 +176,7 @@ else | 28 | @@ -210,7 +210,7 @@ if have_dbus_daemon |
29 | endif | 29 | endif |
30 | 30 | ||
31 | # Test programs buildable on UNIX only | 31 | # Test programs buildable on UNIX only |
@@ -33,8 +33,8 @@ index abe676767c60..34b347815308 100644 | |||
33 | +if host_system != 'windows' | 33 | +if host_system != 'windows' |
34 | gio_tests += { | 34 | gio_tests += { |
35 | 'file' : {}, | 35 | 'file' : {}, |
36 | 'gdbus-peer' : { | 36 | 'gdbus-peer-object-manager' : {}, |
37 | @@ -434,7 +434,7 @@ if host_machine.system() != 'windows' | 37 | @@ -462,7 +462,7 @@ if host_machine.system() != 'windows' |
38 | endif # unix | 38 | endif # unix |
39 | 39 | ||
40 | # Test programs buildable on Windows only | 40 | # Test programs buildable on Windows only |
@@ -43,7 +43,7 @@ index abe676767c60..34b347815308 100644 | |||
43 | gio_tests += {'win32-streams' : {}} | 43 | gio_tests += {'win32-streams' : {}} |
44 | endif | 44 | endif |
45 | 45 | ||
46 | @@ -504,7 +504,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' | 46 | @@ -532,7 +532,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' |
47 | } | 47 | } |
48 | endif | 48 | endif |
49 | 49 | ||
@@ -53,10 +53,10 @@ index abe676767c60..34b347815308 100644 | |||
53 | 'gdbus-example-unix-fd-client' : { | 53 | 'gdbus-example-unix-fd-client' : { |
54 | 'install' : false, | 54 | 'install' : false, |
55 | diff --git a/glib/tests/meson.build b/glib/tests/meson.build | 55 | diff --git a/glib/tests/meson.build b/glib/tests/meson.build |
56 | index a0c64afe6ae9..48407f99569c 100644 | 56 | index db01b54..6950817 100644 |
57 | --- a/glib/tests/meson.build | 57 | --- a/glib/tests/meson.build |
58 | +++ b/glib/tests/meson.build | 58 | +++ b/glib/tests/meson.build |
59 | @@ -151,7 +151,7 @@ if glib_conf.has('HAVE_EVENTFD') | 59 | @@ -188,7 +188,7 @@ if glib_conf.has('HAVE_EVENTFD') |
60 | } | 60 | } |
61 | endif | 61 | endif |
62 | 62 | ||
@@ -66,10 +66,10 @@ index a0c64afe6ae9..48407f99569c 100644 | |||
66 | glib_tests += { | 66 | glib_tests += { |
67 | 'gpoll' : { | 67 | 'gpoll' : { |
68 | diff --git a/meson.build b/meson.build | 68 | diff --git a/meson.build b/meson.build |
69 | index e0b14319fb58..f6756a3c7dfb 100644 | 69 | index 43bb468..5f9b59c 100644 |
70 | --- a/meson.build | 70 | --- a/meson.build |
71 | +++ b/meson.build | 71 | +++ b/meson.build |
72 | @@ -54,6 +54,9 @@ else | 72 | @@ -43,6 +43,9 @@ else |
73 | endif | 73 | endif |
74 | 74 | ||
75 | host_system = host_machine.system() | 75 | host_system = host_machine.system() |
@@ -79,19 +79,3 @@ index e0b14319fb58..f6756a3c7dfb 100644 | |||
79 | 79 | ||
80 | if host_system == 'darwin' | 80 | if host_system == 'darwin' |
81 | ios_test_code = '''#include <TargetConditionals.h> | 81 | ios_test_code = '''#include <TargetConditionals.h> |
82 | diff --git a/tests/meson.build b/tests/meson.build | ||
83 | index 5ff99a4a8258..8a4dad0ccae7 100644 | ||
84 | --- a/tests/meson.build | ||
85 | +++ b/tests/meson.build | ||
86 | @@ -53,7 +53,7 @@ test_extra_programs = { | ||
87 | 'assert-msg-test' : {}, | ||
88 | } | ||
89 | |||
90 | -if host_machine.system() != 'windows' | ||
91 | +if host_system != 'windows' | ||
92 | tests += { | ||
93 | 'timeloop' : {}, | ||
94 | } | ||
95 | -- | ||
96 | 2.34.1 | ||
97 | |||