From a22d6cd0d31b19b0d218812008b0a18011f286bf Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Tue, 3 Dec 2024 19:58:00 -0800 Subject: [PATCH] raylib: disable build on ubuntu focal (#34150) build --- system/ui/SConscript | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/system/ui/SConscript b/system/ui/SConscript index 0e164efb92..e97282b54e 100644 --- a/system/ui/SConscript +++ b/system/ui/SConscript @@ -1,18 +1,23 @@ +import subprocess + Import('env', 'arch', 'common') renv = env.Clone() -rayutil = env.Library("rayutil", ['raylib/util.cc'], LIBS='raylib') -linked_libs = ['raylib', rayutil, common] -renv['LIBPATH'] += [f'#third_party/raylib/{arch}/'] +UBUNTU_FOCAL = int(subprocess.check_output('[ -f /etc/os-release ] && . /etc/os-release && [ "$ID" = "ubuntu" ] && [ "$VERSION_ID" = "20.04" ] && echo 1 || echo 0', shell=True, encoding='utf-8').rstrip()) + +if not UBUNTU_FOCAL: + rayutil = env.Library("rayutil", ['raylib/util.cc'], LIBS='raylib') + linked_libs = ['raylib', rayutil, common] + renv['LIBPATH'] += [f'#third_party/raylib/{arch}/'] -mac_frameworks = [] -if arch == "Darwin": - mac_frameworks += ['OpenCL', 'CoreVideo', 'Cocoa', 'GLUT', 'CoreFoundation', 'OpenGL', 'IOKit'] -elif arch == 'larch64': - linked_libs += ['GLESv2', 'GL', 'EGL', 'wayland-client', 'wayland-egl'] -else: - linked_libs += ['OpenCL', 'dl', 'pthread'] + mac_frameworks = [] + if arch == "Darwin": + mac_frameworks += ['OpenCL', 'CoreVideo', 'Cocoa', 'GLUT', 'CoreFoundation', 'OpenGL', 'IOKit'] + elif arch == 'larch64': + linked_libs += ['GLESv2', 'GL', 'EGL', 'wayland-client', 'wayland-egl'] + else: + linked_libs += ['OpenCL', 'dl', 'pthread'] -if arch != 'aarch64': - renv.Program("spinner", ["raylib/spinner.cc"], LIBS=linked_libs, FRAMEWORKS=mac_frameworks) + if arch != 'aarch64': + renv.Program("spinner", ["raylib/spinner.cc"], LIBS=linked_libs, FRAMEWORKS=mac_frameworks)