MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-07-19 15:29:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

iftop: fix build with gcc-15

Browse Source 
fixes:
http://errors.yoctoproject.org/Errors/Details/848458/

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Martin Jansa 2025-03-21 10:37:42 +01:00 committed by Khem Raj
parent d760c1acce
commit f19750acc1
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
meta-networking/recipes-support/iftop/iftop/0001-cfgfile-fix-build-with-gcc-15.patch Normal file
View File

@ -0,0 +1,46 @@
From e579fbe1f73dc89e2bf81a5b6c949f8ae24f93b2 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Fri, 21 Mar 2025 09:31:05 +0000
Subject: [PATCH] cfgfile: fix build with gcc-15
* fix read_config declaration to match
cfgfile.c:247:5: error: conflicting types for 'read_config'; have 'int(char *, int)'
247 | int read_config(char *file, int whinge_on_error) {
| ^~~~~~~~~~~
In file included from cfgfile.c:16:
cfgfile.h:16:5: note: previous declaration of 'read_config' with type 'int(void)'
16 | int read_config();
| ^~~~~~~~~~~
make[2]: *** [Makefile:566: cfgfile.o] Error 1
make[2]: *** Waiting for unfinished jobs....
iftop.c: In function 'main':
iftop.c:803:5: error: too many arguments to function 'read_config'; expected 0, have 2
803 | read_config(options.config_file, options.config_file_specified);
| ^~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
In file included from iftop.c:50:
cfgfile.h:16:5: note: declared here
16 | int read_config();
| ^~~~~~~~~~~
Upstream-Status: Pending [last pre release was over 10 years ago and https://code.blinkace.com/pdw/iftop has last commit from 4 years ago]
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
cfgfile.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cfgfile.h b/cfgfile.h
index 11ba475..a331b75 100644
--- a/cfgfile.h
+++ b/cfgfile.h
@@ -13,7 +13,7 @@ typedef struct {
int value;
} config_enumeration_type;
-int read_config();
+int read_config(char *file, int whinge_on_error);
char *config_get_string(const char *directive);
int config_get_bool(const char *directive);

1
meta-networking/recipes-support/iftop/iftop_1.0pre4.bb
View File

@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76498170798db0f4f0fb685a225f702f"
SRC_URI = "http://www.ex-parrot.com/pdw/iftop/download/iftop-${PV}.tar.gz \
file://iftop-1.0-gcc10.patch \
file://0001-cfgfile-fix-build-with-gcc-15.patch \
"
SRC_URI[md5sum] = "7e6decb4958e8a4890cccac335239f24"
SRC_URI[sha256sum] = "f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97"