On Wed, Apr 7, 2021 at 1:08 AM Yu, Mingli <mingli...@windriver.com> wrote: > > From: Mingli Yu <mingli...@windriver.com> > > NR_futex is not defined by newer architectures e.g. riscv32 as > they only have 64bit variant of time_t. Glibc defines SYS_futex > interface based on __NR_futex, since this is used in applications, > such applications start to fail to build for these newer architectures. > > Define a fallback to alias __NR_futex to __NR_futex_time64 to make > SYS_futex keep working. > > Reference: > https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7 > > Signed-off-by: Mingli Yu <mingli...@windriver.com> > --- > ...h-Define-SYS_futex-if-it-does-not-ex.patch | 39 +++++++++++++++++++ > .../xorg-lib/libxshmfence_1.3.bb | 4 +- > 2 files changed, 42 insertions(+), 1 deletion(-) > create mode 100644 > meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch > > diff --git > a/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch > > b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch > new file mode 100644 > index 0000000000..3e87794d20 > --- /dev/null > +++ > b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch > @@ -0,0 +1,39 @@ > +From 5827f6389a227157958d14a687fb29223cb3a03a Mon Sep 17 00:00:00 2001 > +From: Mingli Yu <mingli...@windriver.com> > +Date: Wed, 7 Apr 2021 07:48:42 +0000 > +Subject: [PATCH] xshmfence_futex.h: Define SYS_futex if it does not exist > + > +_NR_futex is not defines by newer architectures e.g. riscv32 as > +they only have 64bit variant of time_t. Glibc defines SYS_futex > +interface based on __NR_futex, since this is used in applications, > +such applications start to fail to build for these newer architectures. > +This patch defines a fallback to alias __NR_futex to __NR_futex_time64 > +to make SYS_futex keep working. > + > +Reference: > https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7 > + > +Upstream-Status: Pending > + > +Signed-off-by: Mingli Yu <mingli...@windriver.com> > +--- > + src/xshmfence_futex.h | 4 ++++ > + 1 file changed, 4 insertions(+) > + > +diff --git a/src/xshmfence_futex.h b/src/xshmfence_futex.h > +index 673ac0e..a71efa5 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> > + > ++#if !defined(SYS_futex) && defined(SYS_futex_time64) > ++#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.29.2 > + > diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb > b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb > index cc45696530..d153c7a603 100644 > --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb > +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb > @@ -13,7 +13,9 @@ DEPENDS += "virtual/libx11" > > EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" > > -BBCLASSEXTEND = "native nativesdk" > +SRC_URI += > "file://0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch" > > SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937" > SRC_URI[sha256sum] = > "b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7" > + > +BBCLASSEXTEND = "native nativesdk"
can you also. send a pull to meta-riscv to remove it from there ?
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150272): https://lists.openembedded.org/g/openembedded-core/message/150272 Mute This Topic: https://lists.openembedded.org/mt/81910708/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
