mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-17 19:39:43 +00:00
Code Issues Releases Activity

devel/readline: Fix build for dependent ports.

Browse Source 
Fixes:		ee994524ff
PR:		281633
Reviewed by:	dim
Differential Revision:	https://reviews.freebsd.org/D46957
This commit is contained in:
Dag-Erling Smørgrav 2024-10-09 14:06:09 +02:00
parent d2886dc755
commit 6d04fa18da
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/readline/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= readline
PORTVERSION= 8.2.${PATCHLEVEL}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= GNU
DISTNAME= readline-${PORTVERSION:R}

29
devel/readline/files/patch-clang18
View File

@ -1,28 +1,31 @@
--- readline.h.orig 2024-09-21 16:56:41 UTC
--- readline.h.orig 2022-02-18 16:13:59 UTC
+++ readline.h
@@ -407,7 +407,7 @@ extern int rl_message (const char *, ...) __attribute
#if defined (USE_VARARGS) && defined (PREFER_STDARG)
@@ -404,10 +404,10 @@ extern int rl_mark_active_p (void);
extern void rl_deactivate_mark (void);
extern int rl_mark_active_p (void);
-#if defined (USE_VARARGS) && defined (PREFER_STDARG)
+#if defined(__GNUC__) || defined(__clang__)
extern int rl_message (const char *, ...) __attribute__((__format__ (printf, 1, 2)));
#else
-extern int rl_message ();
+extern int rl_message (void);
+extern int rl_message (const char *, ...);
#endif
extern int rl_show_char (int);
--- rltypedefs.h.orig 2021-01-22 15:04:18 UTC
+++ rltypedefs.h
@@ -32,10 +32,10 @@ extern "C" {
@@ -32,10 +32,13 @@ extern "C" {
# define _FUNCTION_DEF
#if defined(__GNUC__) || defined(__clang__)
-typedef int Function () __attribute__((deprecated));
-typedef void VFunction () __attribute__((deprecated));
-typedef char *CPFunction () __attribute__((deprecated));
-typedef char **CPPFunction () __attribute__((deprecated));
+typedef int Function (void) __attribute__((deprecated));
+typedef void VFunction (void) __attribute__((deprecated));
+typedef char *CPFunction (void) __attribute__((deprecated));
+typedef char **CPPFunction (void) __attribute__((deprecated));
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
typedef int Function () __attribute__((deprecated));
typedef void VFunction () __attribute__((deprecated));
typedef char *CPFunction () __attribute__((deprecated));
typedef char **CPPFunction () __attribute__((deprecated));
+#pragma GCC diagnostic pop
#else
typedef int Function ();
typedef void VFunction ();