mesa,libxshmfence: Define __NR_futex for rv32

Helps these nosy apps build Fixes riscv#201 Signed-off-by: Khem Raj <raj.khem@gmail.com>
YoeDistro · Jan 31, 2020 · 9f0457d · 9f0457d
1 parent 687750d
commit 9f0457d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/recipes-graphics/mesa/mesa/rv32-sys-futex.patch b/recipes-graphics/mesa/mesa/rv32-sys-futex.patch
@@ -0,0 +1,13 @@
+--- a/src/util/futex.h
++++ b/src/util/futex.h
+@@ -26,6 +26,10 @@
+
+ #if defined(HAVE_LINUX_FUTEX_H)
+
++#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32
++# define __NR_futex __NR_futex_time64
++#endif
++
+ #include <limits.h>
+ #include <stdint.h>
+ #include <unistd.h>
diff --git a/recipes-graphics/mesa/mesa_19.%.bbappend b/recipes-graphics/mesa/mesa_19.%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append_riscv32 = " file://rv32-sys-futex.patch"
diff --git a/recipes-graphics/xorg-lib/libxshmfence/rv32_sys_futex.patch b/recipes-graphics/xorg-lib/libxshmfence/rv32_sys_futex.patch
@@ -0,0 +1,13 @@
+--- a/src/xshmfence_futex.h
++++ b/src/xshmfence_futex.h
+@@ -47,6 +47,10 @@ static inline int futex_wait(int32_t *ad
+
+ #else
+
++#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32
++# define __NR_futex __NR_futex_time64
++#endif
++
+ #include <stdint.h>
+ #include <values.h>
+ #include <linux/futex.h>
diff --git a/recipes-graphics/xorg-lib/libxshmfence_1.3.bbappend b/recipes-graphics/xorg-lib/libxshmfence_1.3.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append_riscv32 = " file://rv32_sys_futex.patch"
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

		SRC_URI_append_riscv32 = " file://rv32-sys-futex.patch"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

		SRC_URI_append_riscv32 = " file://rv32_sys_futex.patch"