summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Devoogdt <thomas@devoogdt.com>2024-02-05 17:47:07 +0100
committerThomas Devoogdt <thomas@devoogdt.com>2024-02-06 14:56:45 +0100
commit8d5037ed642b02cdb018e49866aa286f30a7b59a (patch)
treeec14ec8aa44b8c1ea38296b55c3593280bcb4894
parent586c8acacd70554759d4a835c2e8aa7d7b04f01b (diff)
meson: always skip IPC_RMID_DEFERRED_RELEASE check when cross-compiling
../../br-test-pkg/bootlin-armv5-uclibc/build/cairo-1.17.4/meson.build:279:13: ERROR: Can not run test applications in this cross environment. Commit 1bec56ea8a931e1ae1c74cc740134497ec365267 added support to define ipc_rmid_deferred_release in a cross-compile config, but still kept the default to auto, which anyhow results in an error when cross-compiling. There is only one usage of the ipc_rmid_deferred_release compile declarative which was originally added in this commit: 5041b462d084de8552336275914d30c23bf5dd35. If ipc_rmid_deferred_release is set to FALSE, an additional XSync is performed. This doesn't sound very harmful, so that is why this commit defaults to FALSE and thus avoids any cross-compile errors. Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
-rw-r--r--meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 9efe91978..6a670bf94 100644
--- a/meson.build
+++ b/meson.build
@@ -369,7 +369,7 @@ if x11_dep.found() and xext_dep.found()
# Can skip the run check by providing the result in a cross file or
# native file as bool property value.
- prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto')
+ prop = meson.get_external_property('ipc_rmid_deferred_release', meson.is_cross_build() ? 'false' : 'auto')
# We don't know the type of prop (bool, string) but need to differentiate
# between a set value (bool) or the fallback value (string), so convert to
# a string and check the string value.