| Message ID | 20240519091627.2195972-1-thomas@devoogdt.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v4,1/2] package/x11r7/xlib_libxshmfence: fix build on riscv32 | expand |
On Sun, 19 May 2024 11:16:26 +0200 Thomas Devoogdt <thomas@devoogdt.com> wrote: > In preparation to revert e39ad96136a8c340b3aea6b036024e28f14584f3, > and (partial) 26642e4cc09666110d5105e7867579a0e48cfa09. > > xshmfence_futex.h: In function 'sys_futex': > xshmfence_futex.h:58:24: 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: > - https://gitlab.com/buildroot.org/buildroot/-/commit/e39ad96136a8c340b3aea6b036024e28f14584f3 > > Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com> > --- > v4: move xlib_libxshmfence to separate patch series > --- > ...tex.h-fix-build-on-32-bit-architectu.patch | 46 +++++++++++++++++++ > 1 file changed, 46 insertions(+) > create mode 100644 package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch Applied to master, thanks. Thomas
>>>>> "Thomas" == Thomas Petazzoni via buildroot <buildroot@buildroot.org> writes: > On Sun, 19 May 2024 11:16:26 +0200 > Thomas Devoogdt <thomas@devoogdt.com> wrote: >> In preparation to revert e39ad96136a8c340b3aea6b036024e28f14584f3, >> and (partial) 26642e4cc09666110d5105e7867579a0e48cfa09. >> >> xshmfence_futex.h: In function 'sys_futex': >> xshmfence_futex.h:58:24: 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: >> - https://gitlab.com/buildroot.org/buildroot/-/commit/e39ad96136a8c340b3aea6b036024e28f14584f3 >> >> Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com> >> --- >> v4: move xlib_libxshmfence to separate patch series >> --- >> ...tex.h-fix-build-on-32-bit-architectu.patch | 46 +++++++++++++++++++ >> 1 file changed, 46 insertions(+) >> create mode 100644 package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch > Applied to master, thanks. Committed to 2024.02.x and 2024.05.x, thanks.
diff --git a/package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch b/package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch new file mode 100644 index 0000000000..f4ef558615 --- /dev/null +++ b/package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch @@ -0,0 +1,46 @@ +From 4fca45a71f08a5bebd12d39c85f49e0b0e4426bf Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt <thomas@devoogdt.com> +Date: Fri, 5 Apr 2024 10:45:15 +0200 +Subject: [PATCH] src/xshmfence_futex.h: fix build on 32-bit architectures + using 64-bit time_t + +Fix the following build failure on 32-bit architectures using 64-bit +time_t (e.g. riscv32): + +xshmfence_futex.h: In function 'sys_futex': +xshmfence_futex.h:58:24: 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 + +Similar to: +https://gitlab.freedesktop.org/mesa/mesa/-/commit/7d87478124061915582412ba410759afe863d679 + +Fixes: +https://gitlab.com/buildroot.org/buildroot/-/commit/e39ad96136a8c340b3aea6b036024e28f14584f3 + +Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com> +Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxshmfence/-/merge_requests/8> +Upstream: https://gitlab.freedesktop.org/xorg/lib/libxshmfence/-/commit/4fca45a71f08a5bebd12d39c85f49e0b0e4426bf +--- + src/xshmfence_futex.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/xshmfence_futex.h b/src/xshmfence_futex.h +index 673ac0e..4476038 100644 +--- a/src/xshmfence_futex.h ++++ b/src/xshmfence_futex.h +@@ -53,6 +53,10 @@ static inline int futex_wait(int32_t *addr, int32_t value) { + #include <sys/time.h> + #include <sys/syscall.h> + ++#ifndef SYS_futex ++#define SYS_futex SYS_futex_time64 ++#endif ++ + static inline long sys_futex(void *addr1, int op, int val1, struct timespec *timeout, void *addr2, int val3) + { + return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); +-- +2.34.1 +
In preparation to revert e39ad96136a8c340b3aea6b036024e28f14584f3, and (partial) 26642e4cc09666110d5105e7867579a0e48cfa09. xshmfence_futex.h: In function 'sys_futex': xshmfence_futex.h:58:24: 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: - https://gitlab.com/buildroot.org/buildroot/-/commit/e39ad96136a8c340b3aea6b036024e28f14584f3 Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com> --- v4: move xlib_libxshmfence to separate patch series --- ...tex.h-fix-build-on-32-bit-architectu.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch