Skip to contentSkip to conversation

package/libkcapi: fix build on riscv32

PATCH New Fabrice Fontaine 3 participants 3 messages May 27, 2021 – Jun 10, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libkcapi: fix build on riscv32

Fix the following build failure on riscv32:

lib/internal.h:331:20: error: '__NR_io_getevents' undeclared (first use in this function); did you mean 'io_getevents'?
331 | return syscall(__NR_io_getevents, ctx, min, max, events, timeout);

      |                    ^~~~~~~~~~~~~~

Fixes:
- http://autobuild.buildroot.org/results/c828d4330a8888fe8db4299dc2f20759947f329f

---
 ...f-__NR_io_getevents-when-not-defined.patch | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch
package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch new file +42 -0
new file mode 100644
index 0000000000..20aa75b741
@@ -0,0 +1,42 @@
+From 455c4938f5822c017c7ff79dd2dca638b6410923 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sun, 15 Nov 2020 18:05:48 -0800
+Subject: [PATCH] Disable use of __NR_io_getevents when not defined
+
+Architectures like riscv32 do not define this syscall, therefore return
+ENOSYS on such architectures
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+Signed-off-by: Stephan Mueller <[email protected]>
+[Retrieved from:
+https://github.com/smuellerDD/libkcapi/commit/455c4938f5822c017c7ff79dd2dca638b6410923]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ lib/internal.h | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/lib/internal.h b/lib/internal.h
+index 1237827..f765461 100644
+--- a/lib/internal.h
++++ b/lib/internal.h
+@@ -325,10 +325,17 @@ static inline int io_submit(aio_context_t ctx, long n,  struct iocb **iocb)
+     return syscall(__NR_io_submit, ctx, n, iocb);
+ }
+ 
+-static inline int io_getevents(aio_context_t ctx, long min, long max,
+-            struct io_event *events, struct timespec *timeout)
++static inline int io_getevents(__attribute__((unused)) aio_context_t ctx,
++            __attribute__((unused)) long min,
++            __attribute__((unused)) long max,
++            __attribute__((unused)) struct io_event *events,
++            __attribute__((unused)) struct timespec *timeout)
+ {
++#ifdef __NR_io_getevents
+     return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
++#else
++    return -ENOSYS;
++#endif
+ }
+ 
+ /************************************************************
Signature · 1 line
2.30.2
#1 lore raw

PATCH 1/1 package/libkcapi: fix build on riscv32

Quoted 21 lines · Fabrice Fontaine

Fix the following build failure on riscv32:

lib/internal.h:331:20: error: '__NR_io_getevents' undeclared (first use in this function); did you mean 'io_getevents'?
331 | return syscall(__NR_io_getevents, ctx, min, max, events, timeout);

      |                    ^~~~~~~~~~~~~~

Fixes:
- http://autobuild.buildroot.org/results/c828d4330a8888fe8db4299dc2f20759947f329f

---
 ...f-__NR_io_getevents-when-not-defined.patch | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch
package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch new file +0 -0
new file mode 100644
index 0000000000..20aa75b741

package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch line 9

Quoted 9 lines
package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch new file +9 -0
@@ -0,0 +1,42 @@
+From 455c4938f5822c017c7ff79dd2dca638b6410923 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sun, 15 Nov 2020 18:05:48 -0800
+Subject: [PATCH] Disable use of __NR_io_getevents when not defined
+
+Architectures like riscv32 do not define this syscall, therefore return
+ENOSYS on such architectures
+
+Upstream-Status: Pending

I don't really like those vague OpenEmbedded patches :-)

Applied to master, thanks.

Regards,
Arnout

Quoted 34 lines
package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch new file +33 -0
+Signed-off-by: Khem Raj <[email protected]>
+Signed-off-by: Stephan Mueller <[email protected]>
+[Retrieved from:
+https://github.com/smuellerDD/libkcapi/commit/455c4938f5822c017c7ff79dd2dca638b6410923]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ lib/internal.h | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/lib/internal.h b/lib/internal.h
+index 1237827..f765461 100644
+--- a/lib/internal.h
++++ b/lib/internal.h
+@@ -325,10 +325,17 @@ static inline int io_submit(aio_context_t ctx, long n,  struct iocb **iocb)
+     return syscall(__NR_io_submit, ctx, n, iocb);
+ }
+ 
+-static inline int io_getevents(aio_context_t ctx, long min, long max,
+-            struct io_event *events, struct timespec *timeout)
++static inline int io_getevents(__attribute__((unused)) aio_context_t ctx,
++            __attribute__((unused)) long min,
++            __attribute__((unused)) long max,
++            __attribute__((unused)) struct io_event *events,
++            __attribute__((unused)) struct timespec *timeout)
+ {
++#ifdef __NR_io_getevents
+     return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
++#else
++    return -ENOSYS;
++#endif
+ }
+ 
+ /************************************************************
#2 lore raw

PATCH 1/1 package/libkcapi: fix build on riscv32

In reply to Fabrice Fontaine
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Fix the following build failure on riscv32:
lib/internal.h:331:20: error: '__NR_io_getevents' undeclared (first use in this function); did you mean 'io_getevents'?
331 | return syscall(__NR_io_getevents, ctx, min, max, events, timeout);

      |                    ^~~~~~~~~~~~~~

Fixes:
- http://autobuild.buildroot.org/results/c828d4330a8888fe8db4299dc2f20759947f329f

Committed to 2021.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard