From 8d5037ed642b02cdb018e49866aa286f30a7b59a Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Mon, 5 Feb 2024 17:47:07 +0100 Subject: [PATCH] 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 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.