openwrt/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-04-15 19:02:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

cligen: fix compilation with GCC 15

Browse Source 
Upstream has this fixed in a massive patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2025-07-11 20:23:36 -07:00
committed by Philip Prindeville
parent aa97547d16
commit 4ab21b1f56
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/cligen/Makefile
View File

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cligen
PKG_VERSION:=7.4.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/clicon/$(PKG_NAME)/tar.gz/$(PKG_VERSION)?

50
utils/cligen/patches/010-gcc15.patch Normal file
View File

@@ -0,0 +1,50 @@
--- a/cligen_getline.c
+++ b/cligen_getline.c
@@ -41,12 +41,12 @@
/********************* exported variables ********************************/
-int (*gl_in_hook)() = NULL;
-int (*gl_out_hook)() = NULL;
-int (*gl_tab_hook)() = NULL;
-int (*gl_qmark_hook)() = NULL;
-int (*gl_susp_hook)() = NULL;
-int (*gl_interrupt_hook)() = NULL;
+int (*gl_in_hook)(void *, char *) = NULL;
+int (*gl_out_hook)(void *, char *) = NULL;
+int (*gl_tab_hook)(cligen_handle, int *) = NULL;
+int (*gl_qmark_hook)(cligen_handle, char *) = NULL;
+int (*gl_susp_hook)(void *, char *, int, int *) = NULL;
+int (*gl_interrupt_hook)(cligen_handle) = NULL;
/******************** internal interface *********************************/
@@ -55,7 +55,7 @@ static void gl_init1(void);
static void gl_cleanup(void); /* to undo gl_init1 */
void gl_char_init(void); /* get ready for no echo input */
void gl_char_cleanup(void); /* undo gl_char_init */
-static size_t (*gl_strlen)(const char *) = (size_t(*)())strlen;
+static size_t (*gl_strlen)(const char *) = strlen;
/* returns printable prompt width */
static int gl_addchar(cligen_handle h, int c); /* install specified char */
@@ -1409,7 +1409,7 @@ gl_fixup(cligen_handle h,
/******************* strlen stuff **************************************/
void
-gl_strwidth(size_t (*func)())
+gl_strwidth(size_t (*func)(const char *))
{
if (func != 0) {
gl_strlen = func;
--- a/cligen_getline.h
+++ b/cligen_getline.h
@@ -23,7 +23,7 @@
/*
* Types
*/
-typedef size_t (*gl_strwidth_proc)(char *);
+typedef size_t (*gl_strwidth_proc)(const char *);
/*
* Prototypes