summaryrefslogtreecommitdiff
blob: 28e6b697a3ad950550179e66b7437561402e842b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
Patch emailed to upstream.

From 216e770ced47ad0017cd43033ef213c2634fe87a Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Tue, 6 Dec 2022 08:53:14 +0000
Subject: [PATCH] sgmls-1.1: fix configure script with Clang 16

Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default.

Unfortunately, this can lead to misconfiguration or miscompilation of software as configure
tests may then return the wrong result. In this case, it led to a build failure
(see https://bugs.gentoo.org/883203).

We also fix -Wstrict-prototypes while here as it's easy to do and it prepares
us for C23.

For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
or the (new) c-std-porting mailing list [3].

[0] https://lwn.net/Articles/913505/
[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
[2] https://wiki.gentoo.org/wiki/Modern_C_porting
[3] hosted at lists.linux.dev.

Bug: https://bugs.gentoo.org/883203
Signed-off-by: Sam James <sam@gentoo.org>
--- a/sgmls-1.1/configure
+++ b/sgmls-1.1/configure
@@ -110,13 +110,14 @@ cat >doit.c <<\EOF
 
 #include <ctype.h>
 #include <signal.h>
+#include <stdlib.h>
 
-static int whoops()
+static void whoops(int signal)
 {
   _exit(1);
 }
 
-main()
+int main(void)
 {
   int c;
 #ifdef isascii
@@ -213,9 +214,9 @@ else
 fi
 
 cat >doit.c <<\EOF
-main(argc, argv)
-int argc;
-char **argv;
+#include <stdio.h>
+#include <stdlib.h>
+int main(int argc, char **argv)
 {
   if (argc == 0)
     remove("foo");
@@ -231,9 +232,9 @@ else
 fi
 
 cat >doit.c <<\EOF
-main(argc, argv)
-int argc;
-char **argv;
+#include <unistd.h>
+#include <stdlib.h>
+int main(int argc, char **argv)
 {
   if (argc == 0)
     getopt(argc, argv, "v");
@@ -249,9 +250,9 @@ else
 fi
 
 cat >doit.c <<\EOF
-main(argc, argv)
-int argc;
-char **argv;
+#include <stdlib.h>
+#include <unistd.h>
+int main(int argc, char **argv)
 {
   if (argc == 0)
     access("foo", 4);
@@ -267,9 +268,9 @@ else
 fi
 
 cat >doit.c <<\EOF
-main(argc, argv)
-int argc;
-char **argv;
+#include <stdlib.h>
+#include <unistd.h>
+int main(int argc, char **argv)
 {
   if (argc == 0)
     vfork();
@@ -285,9 +286,9 @@ else
 fi
 
 cat >doit.c <<\EOF
-main(argc, argv)
-int argc;
-char **argv;
+#include <stdlib.h>
+#include <sys/wait.h>
+int main(int argc, char **argv)
 {
 
   if (argc == 0) {
@@ -306,10 +307,9 @@ else
 fi
 
 cat >doit.c <<\EOF
+#include <stdlib.h>
 #include <string.h>
-main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 {
   if (argc == 0)
     strerror(0);
@@ -326,9 +326,8 @@ fi
 
 cat >doit.c <<\EOF
 #include <strings.h>
-main(argc, argv)
-int argc;
-char **argv;
+#include <stdlib.h>
+int main(int argc, char **argv)
 {
   if (argc == 0)
 	bcopy((char *)0, (char *)0, 0);
@@ -340,10 +339,9 @@ if $CC $CFLAGS -o doit doit.c $LIBS >/dev/null 2>&1 && ./doit 2>/dev/null
 then
 	# Only use BSD_STRINGS if ANSI string functions don't work.
 	cat >doit.c <<\EOF
+#include <stdlib.h>
 #include <string.h>
-main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 {
   if (argc == 0)
 	memcpy((char *)0, (char *)0, 0);
@@ -363,9 +361,8 @@ fi
 
 cat >doit.c <<\EOF
 #include <signal.h>
-main(argc, argv)
-int argc;
-char **argv;
+#include <stdlib.h>
+int main(int argc, char **argv)
 {
   if (argc == 0)
     raise(SIGINT);
@@ -382,9 +379,8 @@ fi
 
 cat >doit.c <<\EOF
 #include <stdio.h>
-main(argc, argv)
-int argc;
-char **argv;
+#include <stdlib.h>
+int main(int argc, char **argv)
 {
   if (argc == 0) {
     fpos_t pos;
@@ -404,12 +400,11 @@ fi
 
 cat >doit.c <<\EOF
 #include <unistd.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
-main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 {
   if (argc == 0) {
     pid_t pid;
@@ -436,14 +431,15 @@ fi
 
 cat >doit.c <<\EOF
 #include <stdio.h>
+#include <stdlib.h>
 #include <signal.h>
 
-static int whoops()
+static void whoops(int signal)
 {
   _exit(1);
 }
 
-main()
+int main(void)
 {
   char buf[30];
 #ifdef SIGSEGV
@@ -469,10 +465,9 @@ fi
 
 cat >doit.c <<\EOF
 #include <nl_types.h>
+#include <stdlib.h>
 
-main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 {
   if (argc == 0) {
     nl_catd d = catopen("foo", 0);
@@ -492,12 +487,11 @@ fi
 
 cat >doit.c <<\EOF
 #include <limits.h>
+#include <stdlib.h>
 
 char c = UCHAR_MAX;
 
-main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 {
 #if CHAR_MIN < 0
   exit(!(c < 0));
@@ -512,7 +506,8 @@ then
 	char_signed=
 else
 	cat >doit.c <<\EOF
-main()
+#include <stdlib.h>
+int main(void)
 {
   int i;
 
-- 
2.38.1