diff options
-rw-r--r-- | meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch | 2 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch | 2 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.4.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.2.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.84.4.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.84.2.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch index e5878a1428..5ad2a0375b 100644 --- a/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch +++ b/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch | |||
@@ -17,7 +17,7 @@ diff --git a/meson.build b/meson.build | |||
17 | index a8bcadc..041b68e 100644 | 17 | index a8bcadc..041b68e 100644 |
18 | --- a/meson.build | 18 | --- a/meson.build |
19 | +++ b/meson.build | 19 | +++ b/meson.build |
20 | @@ -2075,7 +2075,7 @@ atomicdefine = ''' | 20 | @@ -2077,7 +2077,7 @@ atomicdefine = ''' |
21 | # We know that we can always use real ("lock free") atomic operations with MSVC | 21 | # We know that we can always use real ("lock free") atomic operations with MSVC |
22 | if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') | 22 | if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') |
23 | have_atomic_lock_free = true | 23 | have_atomic_lock_free = true |
diff --git a/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch b/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch index e512940e34..aa098da379 100644 --- a/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch +++ b/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch | |||
@@ -17,7 +17,7 @@ diff --git a/meson.build b/meson.build | |||
17 | index 041b68e..155bfd4 100644 | 17 | index 041b68e..155bfd4 100644 |
18 | --- a/meson.build | 18 | --- a/meson.build |
19 | +++ b/meson.build | 19 | +++ b/meson.build |
20 | @@ -1073,7 +1073,8 @@ if cc.links('''#include <sys/syscall.h> | 20 | @@ -1075,7 +1075,8 @@ if cc.links('''#include <sys/syscall.h> |
21 | waitid (P_PIDFD, 0, &child_info, WEXITED | WNOHANG); | 21 | waitid (P_PIDFD, 0, &child_info, WEXITED | WNOHANG); |
22 | return 0; | 22 | return 0; |
23 | }''', name : 'pidfd_open(2) system call') | 23 | }''', name : 'pidfd_open(2) system call') |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.2.bb b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.4.bb index acec7e9676..acec7e9676 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.2.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.4.bb | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.84.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.84.4.bb index ef80cc47cf..ef80cc47cf 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.84.2.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.84.4.bb | |||
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 819f3ff50a..c171598bed 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -234,7 +234,7 @@ SRC_URI:append:class-native = " file://relocate-modules.patch \ | |||
234 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ | 234 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ |
235 | " | 235 | " |
236 | 236 | ||
237 | SRC_URI[sha256sum] = "88e960dd937057407d61fcb3b45a860704b25923c37ae2478b85f2ecb5a4021f" | 237 | SRC_URI[sha256sum] = "8a9ea10943c36fc117e253f80c91e477b673525ae45762942858aef57631bb90" |
238 | 238 | ||
239 | # Find any meson cross files in FILESPATH that are relevant for the current | 239 | # Find any meson cross files in FILESPATH that are relevant for the current |
240 | # build (using siteinfo) and add them to EXTRA_OEMESON. | 240 | # build (using siteinfo) and add them to EXTRA_OEMESON. |