[gtk/wip/smcv/reliable-gresource: 208/208] build: Use more conservative GResource embedding on non-x86_64




commit 60a83a51c3c3ae926df991a1e92a61a6129adaa6
Author: Simon McVittie <smcv debian org>
Date:   Sat Sep 17 21:50:38 2022 +0100

    build: Use more conservative GResource embedding on non-x86_64
    
    Doing clever things with objcopy is faster and seems to be reliable on
    x86_64 Linux, but also doesn't work on all toolchains and architectures:
    in particular, Debian has had trouble with this on arm and mips.
    In a distro build environment where we are compiling all of GTK every
    time, the cost of potentially unreliable builds is higher than the cost
    of using slower but more conservative GResource embedding.
    
    Resolves: https://gitlab.gnome.org/GNOME/gtk/-/issues/5107
    Signed-off-by: Simon McVittie <smcv debian org>

 gtk/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index 080bffe0a6..225b0b8cac 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -877,7 +877,7 @@ endif
 
 ld = find_program('ld', required : false)
 
-if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' 
and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+if not meson.is_cross_build() and build_machine.cpu_family() == 'x86_64' and build_machine.system() == 
'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
   glib_compile_resources = find_program('glib-compile-resources')
 
   # Create the resource blob


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]