summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-03 18:25:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-05 13:19:54 +0100
commite2e161170ed55048905f0e465dfb9278e356a2a0 (patch)
tree3563b298e54cf40e798d7cfc254ecb001e2b7789 /meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch
parent631b2221170bc8ec24e679969065f20e065655cd (diff)
downloadpoky-e2e161170ed55048905f0e465dfb9278e356a2a0.tar.gz
glib-2.0: update 2.62.4 -> 2.64.2
Add a couple of missing ptest dependencies. Drop backports. (From OE-Core rev: 8c2d45680ad0d8b2ab5bc7f78579fc82b04e6134) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch
index 833ad2540e..44482dd2b7 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch
@@ -1,4 +1,4 @@
1From cce617bec254e327ed7bcad60f58208024c6dc42 Mon Sep 17 00:00:00 2001 1From 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 12 Oct 2019 17:46:26 -0700 3Date: Sat, 12 Oct 2019 17:46:26 -0700
4Subject: [PATCH] meson: Run atomics test on clang as well 4Subject: [PATCH] meson: Run atomics test on clang as well
@@ -9,15 +9,16 @@ Fixes
9 9
10Upstream-Status: Pending 10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
12--- 13---
13 meson.build | 2 +- 14 meson.build | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
15 16
16diff --git a/meson.build b/meson.build 17diff --git a/meson.build b/meson.build
17index 9731de4..c678931 100644 18index afb6eaa..6aa70f5 100644
18--- a/meson.build 19--- a/meson.build
19+++ b/meson.build 20+++ b/meson.build
20@@ -1634,7 +1634,7 @@ atomicdefine = ''' 21@@ -1692,7 +1692,7 @@ atomicdefine = '''
21 # We know that we can always use real ("lock free") atomic operations with MSVC 22 # 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') 23 if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops')
23 have_atomic_lock_free = true 24 have_atomic_lock_free = true
@@ -26,6 +27,3 @@ index 9731de4..c678931 100644
26 # Old gcc release may provide 27 # Old gcc release may provide
27 # __sync_bool_compare_and_swap but doesn't define 28 # __sync_bool_compare_and_swap but doesn't define
28 # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 29 # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
29--
302.23.0
31