summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-support/ncp
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking/recipes-support/ncp')
-rw-r--r--meta-networking/recipes-support/ncp/libowfat/0001-fix-incompatible-type-error-with-gcc-15.patch100
-rw-r--r--meta-networking/recipes-support/ncp/libowfat_0.32.bb1
2 files changed, 101 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/ncp/libowfat/0001-fix-incompatible-type-error-with-gcc-15.patch b/meta-networking/recipes-support/ncp/libowfat/0001-fix-incompatible-type-error-with-gcc-15.patch
new file mode 100644
index 0000000000..6f5f3e712e
--- /dev/null
+++ b/meta-networking/recipes-support/ncp/libowfat/0001-fix-incompatible-type-error-with-gcc-15.patch
@@ -0,0 +1,100 @@
1From 397d00cfd672f3782196e927d0a878ab1d800112 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Fri, 18 Apr 2025 17:30:48 +0900
4Subject: [PATCH] fix incompatible type error with gcc 15
5
6 * fix following errors:
7 ./select.h:13:12: error: conflicting types for 'select'; have 'int(void)'
8 13 | extern int select();
9 | ^~~~~~
10 In file included from TOPDIR/tmp/work/core2-64-oe-linux/libowfat/0.32/recipe-sysroot/usr/include/sys/types.h:179,
11 from ./select.h:6:
12 ./buffer.h:40:65: error: initialization of 'ssize_t (*)(void)' {aka 'long int (*)(void)'} from incompatible pointer type 'ssize_t (*)(int, char *, size_t)' {aka 'long int (*)(int, char *, long unsigned int)'} [-Wincompatible-pointer-types]
13 40 | #define BUFFER_INIT(op,fd,buf,len) { (char*)(buf), 0, 0, (len), (op), NULL, NULL, (fd) }
14 | ^
15Upstream-Status: Submitted [felix-libowfat@fefe.de]
16Signed-off-by: mark.yang <mark.yang@lge.com>
17---
18 buffer.h | 2 +-
19 buffer/buffer_frombuf.c | 2 +-
20 buffer/buffer_stubborn.c | 2 +-
21 buffer/buffer_stubborn2.c | 2 +-
22 buffer/buffer_tosa.c | 2 +-
23 select.h2 | 2 --
24 6 files changed, 5 insertions(+), 7 deletions(-)
25
26diff --git a/buffer.h b/buffer.h
27index 54bed5c..eaf7acb 100644
28--- a/buffer.h
29+++ b/buffer.h
30@@ -24,7 +24,7 @@ typedef struct buffer {
31 int fd; /* passed as first argument to op */
32 } buffer;
33
34-#define BUFFER_INIT(op,fd,buf,len) { (buf), 0, 0, (len), (op), NULL, NULL, (fd) }
35+#define BUFFER_INIT(op,fd,buf,len) { (buf), 0, 0, (len), (void*)(op), NULL, NULL, (fd) }
36 #define BUFFER_INIT_FREE(op,fd,buf,len) { (buf), 0, 0, (len), (op), NULL, buffer_free, (fd) }
37 #define BUFFER_INIT_READ(op,fd,buf,len) BUFFER_INIT(op,fd,buf,len) /*obsolete*/
38 #define BUFFER_INSIZE 8192
39diff --git a/buffer/buffer_frombuf.c b/buffer/buffer_frombuf.c
40index 0c9d931..2aa27ca 100644
41--- a/buffer/buffer_frombuf.c
42+++ b/buffer/buffer_frombuf.c
43@@ -14,6 +14,6 @@ void buffer_frombuf(buffer* b,const char* x,size_t l) {
44 b->n=l;
45 b->a=l;
46 b->fd=0;
47- b->op=dummyreadwrite;
48+ b->op=(void*)dummyreadwrite;
49 b->deinit=0;
50 }
51diff --git a/buffer/buffer_stubborn.c b/buffer/buffer_stubborn.c
52index 2e00418..8079000 100644
53--- a/buffer/buffer_stubborn.c
54+++ b/buffer/buffer_stubborn.c
55@@ -1,7 +1,7 @@
56 #include <errno.h>
57 #include "buffer.h"
58
59-int buffer_stubborn(ssize_t (*op)(),int fd,const char* buf, size_t len,void* cookie) {
60+int buffer_stubborn(ssize_t (*op)(int,char*,size_t,void*),int fd,const char* buf, size_t len,void* cookie) {
61 ssize_t w;
62 errno=0;
63 while (len) {
64diff --git a/buffer/buffer_stubborn2.c b/buffer/buffer_stubborn2.c
65index b9146e2..b47a245 100644
66--- a/buffer/buffer_stubborn2.c
67+++ b/buffer/buffer_stubborn2.c
68@@ -1,7 +1,7 @@
69 #include <errno.h>
70 #include "buffer.h"
71
72-ssize_t buffer_stubborn_read(ssize_t (*op)(),int fd,const char* buf, size_t len,void* cookie) {
73+ssize_t buffer_stubborn_read(ssize_t (*op)(int,char*,size_t,void*),int fd,const char* buf, size_t len,void* cookie) {
74 ssize_t w;
75 for (;;) {
76 if ((w=op(fd,buf,len,cookie))<0)
77diff --git a/buffer/buffer_tosa.c b/buffer/buffer_tosa.c
78index a10be4f..99111a9 100644
79--- a/buffer/buffer_tosa.c
80+++ b/buffer/buffer_tosa.c
81@@ -21,7 +21,7 @@ int buffer_tosa(buffer* b,stralloc* sa) {
82 b->n=0;
83 b->a=1024;
84 b->fd=0;
85- b->op=strallocwrite;
86+ b->op=(void*)strallocwrite;
87 b->cookie=sa;
88 b->deinit=0;
89 return 0;
90diff --git a/select.h2 b/select.h2
91index 961c380..2a22543 100644
92--- a/select.h2
93+++ b/select.h2
94@@ -10,6 +10,4 @@
95 /* braindead BSD uses bzero in FD_ZERO but doesn't #include string.h */
96 #include <string.h>
97
98-extern int select();
99-
100 #endif
diff --git a/meta-networking/recipes-support/ncp/libowfat_0.32.bb b/meta-networking/recipes-support/ncp/libowfat_0.32.bb
index 94f36f904a..cc67d9aefa 100644
--- a/meta-networking/recipes-support/ncp/libowfat_0.32.bb
+++ b/meta-networking/recipes-support/ncp/libowfat_0.32.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
9SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz \ 9SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz \
10 file://0001-Depend-on-haveuint128.h-for-umult64.c.patch \ 10 file://0001-Depend-on-haveuint128.h-for-umult64.c.patch \
11 file://0001-replace-__pure__-with-compiler-attribute-pure.patch \ 11 file://0001-replace-__pure__-with-compiler-attribute-pure.patch \
12 file://0001-fix-incompatible-type-error-with-gcc-15.patch \
12 " 13 "
13SRC_URI[md5sum] = "ee015ccf45cb2bc61c942642038c2bdc" 14SRC_URI[md5sum] = "ee015ccf45cb2bc61c942642038c2bdc"
14SRC_URI[sha256sum] = "f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1" 15SRC_URI[sha256sum] = "f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1"