diff options
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/daemontools/daemontools/0001-fix-prototype-declaration-with-gcc-15.patch | 252 | ||||
| -rw-r--r-- | meta-oe/recipes-support/daemontools/daemontools_0.76.bb | 1 |
2 files changed, 253 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-fix-prototype-declaration-with-gcc-15.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-fix-prototype-declaration-with-gcc-15.patch new file mode 100644 index 0000000000..8910b40ec5 --- /dev/null +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-fix-prototype-declaration-with-gcc-15.patch | |||
| @@ -0,0 +1,252 @@ | |||
| 1 | From d4e8b6638ede51dee635317baf86a43d40bc45d2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "mark.yang" <mark.yang@lge.com> | ||
| 3 | Date: Tue, 8 Apr 2025 14:02:04 +0900 | ||
| 4 | Subject: [PATCH] fix prototype declaration with gcc 15 | ||
| 5 | |||
| 6 | * Fix prototype declaration and too many arguments function errors due to outdated style | ||
| 7 | byte_chr.c:9:1: error: number of arguments doesn't match prototype | ||
| 8 | 9 | { | ||
| 9 | | ^ | ||
| 10 | In file included from byte_chr.c:3: | ||
| 11 | byte.h:6:21: error: prototype declaration | ||
| 12 | 6 | extern unsigned int byte_chr(); | ||
| 13 | | ^~~~~~~~ | ||
| 14 | ... | ||
| 15 | ./compile buffer_get.c | ||
| 16 | buffer_get.c: In function 'oneread': | ||
| 17 | buffer_get.c:12:9: error: too many arguments to function 'op'; expected 0, have 3 | ||
| 18 | 12 | r = op(fd,buf,len); | ||
| 19 | | ^~ ~~ | ||
| 20 | ... | ||
| 21 | supervise.c: In function 'doit': | ||
| 22 | supervise.c:144:11: error: too many arguments to function 'wait_nohang'; expected 0, have 1 | ||
| 23 | 144 | r = wait_nohang(&wstat); | ||
| 24 | | ^~~~~~~~~~~ ~~~~~~ | ||
| 25 | |||
| 26 | Upstream-Status: Inactive-Upstream [lastrelease: 10 years ago] | ||
| 27 | Signed-off-by: mark.yang <mark.yang@lge.com> | ||
| 28 | --- | ||
| 29 | src/alloc.c | 6 ++---- | ||
| 30 | src/alloc.h | 6 +++--- | ||
| 31 | src/alloc_re.c | 5 +---- | ||
| 32 | src/buffer_get.c | 2 +- | ||
| 33 | src/buffer_put.c | 2 +- | ||
| 34 | src/byte.h | 10 +++++----- | ||
| 35 | src/byte_chr.c | 5 +---- | ||
| 36 | src/byte_copy.c | 5 +---- | ||
| 37 | src/byte_cr.c | 5 +---- | ||
| 38 | src/byte_diff.c | 5 +---- | ||
| 39 | src/byte_rchr.c | 5 +---- | ||
| 40 | src/select.h2 | 1 - | ||
| 41 | src/wait.h | 4 ++-- | ||
| 42 | 13 files changed, 20 insertions(+), 41 deletions(-) | ||
| 43 | |||
| 44 | diff --git a/src/alloc.c b/src/alloc.c | ||
| 45 | index c741aa4..5b21993 100644 | ||
| 46 | --- a/src/alloc.c | ||
| 47 | +++ b/src/alloc.c | ||
| 48 | @@ -12,8 +12,7 @@ static aligned realspace[SPACE / ALIGNMENT]; | ||
| 49 | #define space ((char *) realspace) | ||
| 50 | static unsigned int avail = SPACE; /* multiple of ALIGNMENT; 0<=avail<=SPACE */ | ||
| 51 | |||
| 52 | -/*@null@*//*@out@*/char *alloc(n) | ||
| 53 | -unsigned int n; | ||
| 54 | +/*@null@*//*@out@*/char *alloc(unsigned int n) | ||
| 55 | { | ||
| 56 | char *x; | ||
| 57 | n = ALIGNMENT + n - (n & (ALIGNMENT - 1)); /* XXX: could overflow */ | ||
| 58 | @@ -23,8 +22,7 @@ unsigned int n; | ||
| 59 | return x; | ||
| 60 | } | ||
| 61 | |||
| 62 | -void alloc_free(x) | ||
| 63 | -char *x; | ||
| 64 | +void alloc_free(char *x) | ||
| 65 | { | ||
| 66 | if (x >= space) | ||
| 67 | if (x < space + SPACE) | ||
| 68 | diff --git a/src/alloc.h b/src/alloc.h | ||
| 69 | index 21122fc..7a13178 100644 | ||
| 70 | --- a/src/alloc.h | ||
| 71 | +++ b/src/alloc.h | ||
| 72 | @@ -3,8 +3,8 @@ | ||
| 73 | #ifndef ALLOC_H | ||
| 74 | #define ALLOC_H | ||
| 75 | |||
| 76 | -extern /*@null@*//*@out@*/char *alloc(); | ||
| 77 | -extern void alloc_free(); | ||
| 78 | -extern int alloc_re(); | ||
| 79 | +extern /*@null@*//*@out@*/char *alloc(unsigned int n); | ||
| 80 | +extern void alloc_free(char *x); | ||
| 81 | +extern int alloc_re(char **x,unsigned int m,unsigned int n); | ||
| 82 | |||
| 83 | #endif | ||
| 84 | diff --git a/src/alloc_re.c b/src/alloc_re.c | ||
| 85 | index 1074609..5096fb1 100644 | ||
| 86 | --- a/src/alloc_re.c | ||
| 87 | +++ b/src/alloc_re.c | ||
| 88 | @@ -3,10 +3,7 @@ | ||
| 89 | #include "alloc.h" | ||
| 90 | #include "byte.h" | ||
| 91 | |||
| 92 | -int alloc_re(x,m,n) | ||
| 93 | -char **x; | ||
| 94 | -unsigned int m; | ||
| 95 | -unsigned int n; | ||
| 96 | +int alloc_re(char **x,unsigned int m,unsigned int n) | ||
| 97 | { | ||
| 98 | char *y; | ||
| 99 | |||
| 100 | diff --git a/src/buffer_get.c b/src/buffer_get.c | ||
| 101 | index 3a6e1b6..2a38fa1 100644 | ||
| 102 | --- a/src/buffer_get.c | ||
| 103 | +++ b/src/buffer_get.c | ||
| 104 | @@ -4,7 +4,7 @@ | ||
| 105 | #include "byte.h" | ||
| 106 | #include "error.h" | ||
| 107 | |||
| 108 | -static int oneread(int (*op)(),int fd,char *buf,unsigned int len) | ||
| 109 | +static int oneread(int (*op)(int, char *, unsigned int),int fd,char *buf,unsigned int len) | ||
| 110 | { | ||
| 111 | int r; | ||
| 112 | |||
| 113 | diff --git a/src/buffer_put.c b/src/buffer_put.c | ||
| 114 | index 23164b3..23d1d2b 100644 | ||
| 115 | --- a/src/buffer_put.c | ||
| 116 | +++ b/src/buffer_put.c | ||
| 117 | @@ -5,7 +5,7 @@ | ||
| 118 | #include "byte.h" | ||
| 119 | #include "error.h" | ||
| 120 | |||
| 121 | -static int allwrite(int (*op)(),int fd,const char *buf,unsigned int len) | ||
| 122 | +static int allwrite(int (*op)(int, const char *, unsigned int),int fd,const char *buf,unsigned int len) | ||
| 123 | { | ||
| 124 | int w; | ||
| 125 | |||
| 126 | diff --git a/src/byte.h b/src/byte.h | ||
| 127 | index 09aab61..d5ccf83 100644 | ||
| 128 | --- a/src/byte.h | ||
| 129 | +++ b/src/byte.h | ||
| 130 | @@ -3,11 +3,11 @@ | ||
| 131 | #ifndef BYTE_H | ||
| 132 | #define BYTE_H | ||
| 133 | |||
| 134 | -extern unsigned int byte_chr(); | ||
| 135 | -extern unsigned int byte_rchr(); | ||
| 136 | -extern void byte_copy(); | ||
| 137 | -extern void byte_copyr(); | ||
| 138 | -extern int byte_diff(); | ||
| 139 | +extern unsigned int byte_chr(char* s,register unsigned int n,int c); | ||
| 140 | +extern unsigned int byte_rchr(char* s,register unsigned int n,int c); | ||
| 141 | +extern void byte_copy(register char* to,register unsigned int n,register char* from); | ||
| 142 | +extern void byte_copyr(register char* to,register unsigned int n,register char* from); | ||
| 143 | +extern int byte_diff(register char* s,register unsigned int n,register char* t); | ||
| 144 | extern void byte_zero(); | ||
| 145 | |||
| 146 | #define byte_equal(s,n,t) (!byte_diff((s),(n),(t))) | ||
| 147 | diff --git a/src/byte_chr.c b/src/byte_chr.c | ||
| 148 | index fd56056..7fbcd61 100644 | ||
| 149 | --- a/src/byte_chr.c | ||
| 150 | +++ b/src/byte_chr.c | ||
| 151 | @@ -2,10 +2,7 @@ | ||
| 152 | |||
| 153 | #include "byte.h" | ||
| 154 | |||
| 155 | -unsigned int byte_chr(s,n,c) | ||
| 156 | -char *s; | ||
| 157 | -register unsigned int n; | ||
| 158 | -int c; | ||
| 159 | +unsigned int byte_chr(char* s,register unsigned int n,int c) | ||
| 160 | { | ||
| 161 | register char ch; | ||
| 162 | register char *t; | ||
| 163 | diff --git a/src/byte_copy.c b/src/byte_copy.c | ||
| 164 | index 74c9e4a..917d795 100644 | ||
| 165 | --- a/src/byte_copy.c | ||
| 166 | +++ b/src/byte_copy.c | ||
| 167 | @@ -2,10 +2,7 @@ | ||
| 168 | |||
| 169 | #include "byte.h" | ||
| 170 | |||
| 171 | -void byte_copy(to,n,from) | ||
| 172 | -register char *to; | ||
| 173 | -register unsigned int n; | ||
| 174 | -register char *from; | ||
| 175 | +void byte_copy(register char* to,register unsigned int n,register char* from) | ||
| 176 | { | ||
| 177 | for (;;) { | ||
| 178 | if (!n) return; *to++ = *from++; --n; | ||
| 179 | diff --git a/src/byte_cr.c b/src/byte_cr.c | ||
| 180 | index 52dc251..ac3ec67 100644 | ||
| 181 | --- a/src/byte_cr.c | ||
| 182 | +++ b/src/byte_cr.c | ||
| 183 | @@ -2,10 +2,7 @@ | ||
| 184 | |||
| 185 | #include "byte.h" | ||
| 186 | |||
| 187 | -void byte_copyr(to,n,from) | ||
| 188 | -register char *to; | ||
| 189 | -register unsigned int n; | ||
| 190 | -register char *from; | ||
| 191 | +void byte_copyr(register char* to,register unsigned int n,register char* from) | ||
| 192 | { | ||
| 193 | to += n; | ||
| 194 | from += n; | ||
| 195 | diff --git a/src/byte_diff.c b/src/byte_diff.c | ||
| 196 | index 0c4d17b..e1ef257 100644 | ||
| 197 | --- a/src/byte_diff.c | ||
| 198 | +++ b/src/byte_diff.c | ||
| 199 | @@ -2,10 +2,7 @@ | ||
| 200 | |||
| 201 | #include "byte.h" | ||
| 202 | |||
| 203 | -int byte_diff(s,n,t) | ||
| 204 | -register char *s; | ||
| 205 | -register unsigned int n; | ||
| 206 | -register char *t; | ||
| 207 | +int byte_diff(register char* s,register unsigned int n,register char* t) | ||
| 208 | { | ||
| 209 | for (;;) { | ||
| 210 | if (!n) return 0; if (*s != *t) break; ++s; ++t; --n; | ||
| 211 | diff --git a/src/byte_rchr.c b/src/byte_rchr.c | ||
| 212 | index 7ea9948..04391bf 100644 | ||
| 213 | --- a/src/byte_rchr.c | ||
| 214 | +++ b/src/byte_rchr.c | ||
| 215 | @@ -2,10 +2,7 @@ | ||
| 216 | |||
| 217 | #include "byte.h" | ||
| 218 | |||
| 219 | -unsigned int byte_rchr(s,n,c) | ||
| 220 | -char *s; | ||
| 221 | -register unsigned int n; | ||
| 222 | -int c; | ||
| 223 | +unsigned int byte_rchr(char* s,register unsigned int n,int c) | ||
| 224 | { | ||
| 225 | register char ch; | ||
| 226 | register char *t; | ||
| 227 | diff --git a/src/select.h2 b/src/select.h2 | ||
| 228 | index 4bd4fcf..b7ac8c9 100644 | ||
| 229 | --- a/src/select.h2 | ||
| 230 | +++ b/src/select.h2 | ||
| 231 | @@ -8,6 +8,5 @@ | ||
| 232 | #include <sys/types.h> | ||
| 233 | #include <sys/time.h> | ||
| 234 | #include <sys/select.h> | ||
| 235 | -extern int select(); | ||
| 236 | |||
| 237 | #endif | ||
| 238 | diff --git a/src/wait.h b/src/wait.h | ||
| 239 | index d294e9d..168d1bf 100644 | ||
| 240 | --- a/src/wait.h | ||
| 241 | +++ b/src/wait.h | ||
| 242 | @@ -3,8 +3,8 @@ | ||
| 243 | #ifndef WAIT_H | ||
| 244 | #define WAIT_H | ||
| 245 | |||
| 246 | -extern int wait_pid(); | ||
| 247 | -extern int wait_nohang(); | ||
| 248 | +extern int wait_pid(int* status, int pid); | ||
| 249 | +extern int wait_nohang(int* status); | ||
| 250 | extern int wait_stop(); | ||
| 251 | extern int wait_stopnohang(); | ||
| 252 | |||
diff --git a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb index 7f77390289..3738b080ff 100644 --- a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb +++ b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb | |||
| @@ -24,6 +24,7 @@ SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \ | |||
| 24 | file://0001-daemontools-Fix-QA-Issue.patch \ | 24 | file://0001-daemontools-Fix-QA-Issue.patch \ |
| 25 | file://warnings.patch \ | 25 | file://warnings.patch \ |
| 26 | file://0001-Fix-signature-of-main-function.patch \ | 26 | file://0001-Fix-signature-of-main-function.patch \ |
| 27 | file://0001-fix-prototype-declaration-with-gcc-15.patch \ | ||
| 27 | " | 28 | " |
| 28 | 29 | ||
| 29 | SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f" | 30 | SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f" |
