diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2025-04-26 19:08:21 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-04-29 09:55:31 +0100 |
| commit | 98f2376d82c732f8c64dd0bb5a838cb14f0cb842 (patch) | |
| tree | cd02ae1ddb77f246108ebfebabfe9748d38e54c3 | |
| parent | ffd02fb1f7f306e55cd096c9b587d1f9b7a0151c (diff) | |
| download | poky-98f2376d82c732f8c64dd0bb5a838cb14f0cb842.tar.gz | |
flex: fix build with gcc-15 on host
* fixes:
http://errors.yoctoproject.org/Errors/Details/853017/
../../flex-2.6.4/src/../lib/malloc.c:6:12: warning: conflicting types for built-in function ‘malloc’; expected ‘void *(long unsigned int)’ [-Wbuiltin-declaration-mismatch]
6 | void *malloc ();
| ^~~~~~
../../flex-2.6.4/src/../lib/malloc.c:5:1: note: ‘malloc’ is declared in header ‘<stdlib.h>’
4 | #include <sys/types.h>
+++ |+#include <stdlib.h>
5 |
../../flex-2.6.4/src/../lib/malloc.c: In function ‘rpl_malloc’:
../../flex-2.6.4/src/../lib/malloc.c:16:15: error: too many arguments to function ‘malloc’; expected 0, have 1
16 | return malloc (n);
| ^~~~~~ ~
../../flex-2.6.4/src/../lib/malloc.c:6:12: note: declared here
6 | void *malloc ();
| ^~~~~~
make[2]: *** [Makefile:1431: ../lib/stage1flex-malloc.o] Error 1
(From OE-Core rev: e1832f02d70bd4082bc82ae2983546c880818491)
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/flex/flex/0001-Match-malloc-signature-to-its-use.patch | 25 | ||||
| -rw-r--r-- | meta/recipes-devtools/flex/flex_2.6.4.bb | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-devtools/flex/flex/0001-Match-malloc-signature-to-its-use.patch b/meta/recipes-devtools/flex/flex/0001-Match-malloc-signature-to-its-use.patch new file mode 100644 index 0000000000..fc3b8c563d --- /dev/null +++ b/meta/recipes-devtools/flex/flex/0001-Match-malloc-signature-to-its-use.patch | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | From cec508013706ef06dbac036905a90cbe075fa03d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Richard Barnes <rbarnes@umn.edu> | ||
| 3 | Date: Wed, 2 Oct 2024 10:35:09 -0700 | ||
| 4 | Subject: [PATCH] Match `malloc` signature to its use | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://github.com/westes/flex/pull/674] | ||
| 7 | |||
| 8 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
| 9 | --- | ||
| 10 | lib/malloc.c | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/lib/malloc.c b/lib/malloc.c | ||
| 14 | index 75e8ef9..701b9b3 100755 | ||
| 15 | --- a/lib/malloc.c | ||
| 16 | +++ b/lib/malloc.c | ||
| 17 | @@ -3,7 +3,7 @@ | ||
| 18 | |||
| 19 | #include <sys/types.h> | ||
| 20 | |||
| 21 | - void *malloc (); | ||
| 22 | + void *malloc (size_t n); | ||
| 23 | |||
| 24 | /* Allocate an N-byte block of memory from the heap. | ||
| 25 | If N is zero, allocate a 1-byte block. */ | ||
diff --git a/meta/recipes-devtools/flex/flex_2.6.4.bb b/meta/recipes-devtools/flex/flex_2.6.4.bb index 793a935962..c29377c5eb 100644 --- a/meta/recipes-devtools/flex/flex_2.6.4.bb +++ b/meta/recipes-devtools/flex/flex_2.6.4.bb | |||
| @@ -19,6 +19,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/flex-${PV}.tar.gz \ | |||
| 19 | file://check-funcs.patch \ | 19 | file://check-funcs.patch \ |
| 20 | file://0001-Emit-no-line-directives-if-gen_line_dirs-is-false.patch \ | 20 | file://0001-Emit-no-line-directives-if-gen_line_dirs-is-false.patch \ |
| 21 | file://0001-build-tests-add-missing-parser-scanner-dependencies.patch \ | 21 | file://0001-build-tests-add-missing-parser-scanner-dependencies.patch \ |
| 22 | file://0001-Match-malloc-signature-to-its-use.patch \ | ||
| 22 | " | 23 | " |
| 23 | 24 | ||
| 24 | SRC_URI[md5sum] = "2882e3179748cc9f9c23ec593d6adc8d" | 25 | SRC_URI[md5sum] = "2882e3179748cc9f9c23ec593d6adc8d" |
