[Buildroot] [git commit branch/2021.05.x] package/x11r7/xlib_libxshmfence: disable on riscv32
From: Peter Korsgaard <peter@korsgaard.com>
Date: 2021-08-08 09:56:26
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=284cc0f838da859d1bd281690653e5354446bac0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.05.x xlib_libxshmfence unconditionally uses SYS_futex which raises the following build failure on riscv32: xshmfence_futex.h:58:17: error: 'SYS_futex' undeclared (first use in this function); did you mean 'sys_futex'? 58 | return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); | ^~~~~~~~~ | sys_futex Fixes: - http://autobuild.buildroot.org/results/b3523e35fde0fac04b96a6278cbc6ffdfe56f7d1 Signed-off-by: Fabrice Fontaine <redacted> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <redacted> (cherry picked from commit e39ad96136a8c340b3aea6b036024e28f14584f3) Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- package/mesa3d/Config.in | 3 ++- package/x11r7/xlib_libxshmfence/Config.in | 3 +++ package/x11r7/xserver_xorg-server/Config.in | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 642088cfe9..9a5183915d 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in@@ -65,7 +65,8 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER !BR2_PACKAGE_MESA3D_OPENGL_GLX && \ !BR2_PACKAGE_MESA3D_OPENGL_EGL select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \ - (BR2_PACKAGE_XORG7 && BR2_TOOLCHAIN_HAS_SYNC_4) + (BR2_PACKAGE_XORG7 && BR2_TOOLCHAIN_HAS_SYNC_4 && \ + !BR2_RISCV_32) config BR2_PACKAGE_MESA3D_VULKAN_DRIVER bool
diff --git a/package/x11r7/xlib_libxshmfence/Config.in b/package/x11r7/xlib_libxshmfence/Config.in
index 710476b357..7823bda7c0 100644
--- a/package/x11r7/xlib_libxshmfence/Config.in
+++ b/package/x11r7/xlib_libxshmfence/Config.in@@ -1,5 +1,8 @@ config BR2_PACKAGE_XLIB_LIBXSHMFENCE bool "libxshmfence" + # Due to use of SYS_futex - can be enabled again when upstream + # adds SYS_futex64 as an alternative + depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HAS_SYNC_4 select BR2_PACKAGE_XORGPROTO help
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index fcd3d0ae00..4dc15435a8 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in@@ -53,7 +53,8 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBPCIACCESS - select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_TOOLCHAIN_HAS_SYNC_4 + select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \ + (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) help This variant of the X.org server is the full-blown variant, as used by desktop GNU/Linux distributions. The drivers (for
_______________________________________________ buildroot mailing list buildroot@busybox.net http://lists.busybox.net/mailman/listinfo/buildroot