summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-08-10 17:24:51 +0100
committerSteve Sakoman <steve@sakoman.com>2023-09-04 04:13:25 -1000
commitc139c0aeda4bb7ce3e034610f815e4994cca7cdc (patch)
tree6fc7b5c2f1200be6f51b03e192bbe4a50142956c
parentf14bac06cfb626dd4adb3b88792974a3146388f7 (diff)
downloadpoky-c139c0aeda4bb7ce3e034610f815e4994cca7cdc.tar.gz
graphene: fix runtime detection of IEEE754 behaviour
Graphene gates a runtime check on whether it is cross-compiling, when it should be whether it can run target binaries. (From OE-Core rev: 49f8ba521e66c489f58b808af7abe61c44af5470) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 61bb4086bea61a0446f469ed3cb0d525860a1a31) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-graphics/graphene/files/float-div.patch28
-rw-r--r--meta/recipes-graphics/graphene/graphene_1.10.8.bb2
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-graphics/graphene/files/float-div.patch b/meta/recipes-graphics/graphene/files/float-div.patch
new file mode 100644
index 0000000000..bf74101b1c
--- /dev/null
+++ b/meta/recipes-graphics/graphene/files/float-div.patch
@@ -0,0 +1,28 @@
1From c19d1f4a7e44e071df3a2612ae2eb20c84e831a6 Mon Sep 17 00:00:00 2001
2From: Emmanuele Bassi <ebassi@gnome.org>
3Date: Thu, 10 Aug 2023 12:44:49 +0100
4Subject: [PATCH] build: Allow host builds when cross-compiling
5
6Environments that set up execution wrappers when cross-compiling should
7be allowed to run code. We only fall back on external properties if we
8really can't run any native code on the host machine.
9
10Upstream-Status: Backport
11Signed-off-by: Ross Burton <ross.burton@arm.com>
12---
13 meson.build | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/meson.build b/meson.build
17index 48f22d7..7dcb9e6 100644
18--- a/meson.build
19+++ b/meson.build
20@@ -270,7 +270,7 @@ int main() {
21 return 0;
22 }
23 '''
24-if meson.is_cross_build()
25+if not meson.can_run_host_binaries()
26 ieee754_float_div = meson.get_external_property('ieee754_float_div', cc.get_id() in ['gcc', 'clang'])
27 message('Cross-building, assuming IEEE 754 division:', ieee754_float_div)
28 else
diff --git a/meta/recipes-graphics/graphene/graphene_1.10.8.bb b/meta/recipes-graphics/graphene/graphene_1.10.8.bb
index 9f5b4d0e2d..55d8a2d74e 100644
--- a/meta/recipes-graphics/graphene/graphene_1.10.8.bb
+++ b/meta/recipes-graphics/graphene/graphene_1.10.8.bb
@@ -7,6 +7,8 @@ GNOMEBASEBUILDCLASS = "meson"
7 7
8inherit gnomebase gobject-introspection gtk-doc 8inherit gnomebase gobject-introspection gtk-doc
9 9
10SRC_URI += "file://float-div.patch"
11
10SRC_URI[archive.sha256sum] = "a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a" 12SRC_URI[archive.sha256sum] = "a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a"
11 13
12# Disable neon support by default on ARM-32 platforms because of the 14# Disable neon support by default on ARM-32 platforms because of the