summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-05-31 01:11:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-01 14:30:40 +0100
commitae642d3fadb83f641034148d833a5c1deb3a1f10 (patch)
tree74f033b933a0f72a2671043d19fbeb56191f49dc
parentfd4a918d88ff07797600af2e4ad514e93dc60267 (diff)
downloadpoky-ae642d3fadb83f641034148d833a5c1deb3a1f10.tar.gz
socat: upgrade to 1.7.2.4
socat manually maintains config.h.in instead of using autoheader, so exclude autoheader from autoreconf and remove all patches that are intended to enable use of autoheader. The license checksum changed, because the company address changed. Based on a upgrade by Hongxu Jia <hongxu.jia@windriver.com>, with cleanup after noticing that config.h.in was hand-maintained. (From OE-Core rev: ea3ec30c19af23f6b62ce3d4d9d42c1fcb23a215) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-connectivity/socat/socat/compile.patch946
-rw-r--r--meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch36
-rw-r--r--meta/recipes-connectivity/socat/socat/fix-xxx_SHIFT-autoheader.patch40
-rw-r--r--meta/recipes-connectivity/socat/socat_1.7.2.4.bb (renamed from meta/recipes-connectivity/socat/socat_1.7.2.3.bb)25
4 files changed, 47 insertions, 1000 deletions
diff --git a/meta/recipes-connectivity/socat/socat/compile.patch b/meta/recipes-connectivity/socat/socat/compile.patch
deleted file mode 100644
index 4d1a0b65cb..0000000000
--- a/meta/recipes-connectivity/socat/socat/compile.patch
+++ /dev/null
@@ -1,946 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3The patch is from http://git.openembedded.org/openembedded/tree/recipes/socat/files/compile.patch
4and was rebased to socat-1.7.2.0.
5
6Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
7Fri Dec 16 17:12:17 CST 2011
8
9diff -Nru socat-1.7.2.0.orig/configure.in socat-1.7.2.0/configure.in
10--- socat-1.7.2.0.orig/configure.in 2011-12-04 21:34:16.000000000 +0800
11+++ socat-1.7.2.0/configure.in 2011-12-16 17:08:59.698367071 +0800
12@@ -88,7 +88,7 @@
13
14
15 dnl Check for extra socket library (for Solaris)
16-AC_CHECK_FUNC(hstrerror, , AC_CHECK_LIB(resolv, hstrerror, [LIBS="$LIBS -lresolv"; AC_DEFINE(HAVE_HSTRERROR)]))
17+AC_CHECK_FUNC(hstrerror, , AC_CHECK_LIB(resolv, hstrerror, [LIBS="$LIBS -lresolv"; AC_DEFINE(HAVE_HSTRERROR, [1], [STRERROR])]))
18 AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
19 AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
20
21@@ -102,7 +102,7 @@
22 [sc_cv_have_prototype_hstrerror=yes]);
23 CFLAGS="$CFLAGS1"])
24 if test $sc_cv_have_prototype_hstrerror = yes; then
25- AC_DEFINE(HAVE_PROTOTYPE_HSTRERROR)
26+ AC_DEFINE(HAVE_PROTOTYPE_HSTRERROR, [1], [Has Strerror])
27 fi
28 AC_MSG_RESULT($sc_cv_have_prototype_hstrerror)
29
30@@ -111,83 +111,83 @@
31 AC_ARG_ENABLE(help, [ --disable-help disable help],
32 [case "$enableval" in
33 no) AC_MSG_RESULT(no);;
34- *) AC_DEFINE(WITH_HELP) AC_MSG_RESULT(yes);;
35+ *) AC_DEFINE(WITH_HELP, [1], [With help]) AC_MSG_RESULT(yes);;
36 esac],
37- [AC_DEFINE(WITH_HELP) AC_MSG_RESULT(yes)])
38+ [AC_DEFINE(WITH_HELP, [1], [With help]) AC_MSG_RESULT(yes)])
39
40 AC_MSG_CHECKING(whether to include STDIO support)
41 AC_ARG_ENABLE(stdio, [ --disable-stdio disable STDIO support],
42 [case "$enableval" in
43 no) AC_MSG_RESULT(no);;
44- *) AC_DEFINE(WITH_STDIO) AC_MSG_RESULT(yes);;
45+ *) AC_DEFINE(WITH_STDIO, [1], [With stdio]) AC_MSG_RESULT(yes);;
46 esac],
47- [AC_DEFINE(WITH_STDIO) AC_MSG_RESULT(yes)])
48+ [AC_DEFINE(WITH_STDIO, [1], [With stdio]) AC_MSG_RESULT(yes)])
49
50 AC_MSG_CHECKING(whether to include FD-number support)
51 AC_ARG_ENABLE(fdnum, [ --disable-fdnum disable FD-number support],
52 [case "$enableval" in
53 no) AC_MSG_RESULT(no);;
54- *) AC_DEFINE(WITH_FDNUM) AC_MSG_RESULT(yes);;
55+ *) AC_DEFINE(WITH_FDNUM, [1], [With fdnum]) AC_MSG_RESULT(yes);;
56 esac],
57- [AC_DEFINE(WITH_FDNUM) AC_MSG_RESULT(yes)])
58+ [AC_DEFINE(WITH_FDNUM, [1], [With fdnum]) AC_MSG_RESULT(yes)])
59
60 AC_MSG_CHECKING(whether to include direct file support)
61 AC_ARG_ENABLE(file, [ --disable-file disable direct file support],
62 [case "$enableval" in
63 no) AC_MSG_RESULT(no);;
64- *) AC_DEFINE(WITH_FILE) AC_MSG_RESULT(yes);;
65+ *) AC_DEFINE(WITH_FILE, [1], [With file]) AC_MSG_RESULT(yes);;
66 esac],
67- [AC_DEFINE(WITH_FILE) AC_MSG_RESULT(yes)])
68+ [AC_DEFINE(WITH_FILE, [1], [With file]) AC_MSG_RESULT(yes)])
69
70 AC_MSG_CHECKING(whether to include direct create support)
71 AC_ARG_ENABLE(creat, [ --disable-creat disable direct create support],
72 [case "$enableval" in
73 no) AC_MSG_RESULT(no);;
74- *) AC_DEFINE(WITH_CREAT) AC_MSG_RESULT(yes);;
75+ *) AC_DEFINE(WITH_CREAT, [1], [With creat]) AC_MSG_RESULT(yes);;
76 esac],
77- [AC_DEFINE(WITH_CREAT) AC_MSG_RESULT(yes)])
78+ [AC_DEFINE(WITH_CREAT, [1], [With creat]) AC_MSG_RESULT(yes)])
79
80 AC_MSG_CHECKING(whether to include gopen support)
81 AC_ARG_ENABLE(gopen, [ --disable-gopen disable open for UNIX socket support],
82 [case "$enableval" in
83 no) AC_MSG_RESULT(no);;
84- *) AC_DEFINE(WITH_GOPEN) AC_MSG_RESULT(yes);;
85+ *) AC_DEFINE(WITH_GOPEN, [1], [With gopen]) AC_MSG_RESULT(yes);;
86 esac],
87- [AC_DEFINE(WITH_GOPEN) AC_MSG_RESULT(yes)])
88+ [AC_DEFINE(WITH_GOPEN, [1], [With gopen]) AC_MSG_RESULT(yes)])
89
90 AC_MSG_CHECKING(whether to include explicit pipe support)
91 AC_ARG_ENABLE(pipe, [ --disable-pipe disable pipe support],
92 [case "$enableval" in
93 no) AC_MSG_RESULT(no);;
94- *) AC_DEFINE(WITH_PIPE) AC_MSG_RESULT(yes);;
95+ *) AC_DEFINE(WITH_PIPE, [1], [With pipe]) AC_MSG_RESULT(yes);;
96 esac],
97- [AC_DEFINE(WITH_PIPE) AC_MSG_RESULT(yes)])
98+ [AC_DEFINE(WITH_PIPE, [1], [With pipe]) AC_MSG_RESULT(yes)])
99
100 AC_MSG_CHECKING(whether to include explicit termios support)
101 AC_ARG_ENABLE(termios, [ --disable-termios disable termios support],
102 [case "$enableval" in
103 no) AC_MSG_RESULT(no);;
104- *) AC_DEFINE(WITH_TERMIOS) AC_MSG_RESULT(yes);;
105+ *) AC_DEFINE(WITH_TERMIOS, [1], [With termios]) AC_MSG_RESULT(yes);;
106 esac],
107- [AC_DEFINE(WITH_TERMIOS) AC_MSG_RESULT(yes)])
108+ [AC_DEFINE(WITH_TERMIOS, [1], [With termios]) AC_MSG_RESULT(yes)])
109
110 AC_MSG_CHECKING(whether to include UNIX socket support)
111 AC_ARG_ENABLE(unix, [ --disable-unix disable UNIX domain socket support],
112 [case "$enableval" in
113 no) AC_MSG_RESULT(no);;
114- *) AC_DEFINE(WITH_UNIX) AC_MSG_RESULT(yes);;
115+ *) AC_DEFINE(WITH_UNIX, [1], [With unix]) AC_MSG_RESULT(yes);;
116 esac],
117- [AC_DEFINE(WITH_UNIX) AC_MSG_RESULT(yes)])
118+ [AC_DEFINE(WITH_UNIX, [1], [With unix]) AC_MSG_RESULT(yes)])
119
120 AC_MSG_CHECKING(whether to include abstract UNIX socket support)
121 AC_ARG_ENABLE(abstract_unixsocket, [ --disable-abstract-unixsocket disable abstract UNIX domain socket support],
122 [case "$enableval" in
123 no) AC_MSG_RESULT(no);;
124- *) AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET) AC_MSG_RESULT(yes);;
125+ *) AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET, [1], [With abstract unix socket]) AC_MSG_RESULT(yes);;
126 esac],
127 [ case "`uname`" in
128 Linux)
129- AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET) AC_MSG_RESULT(yes);;
130+ AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET, [1], [With abstract unix socket]) AC_MSG_RESULT(yes);;
131 *)
132 AC_MSG_RESULT(no);;
133 esac])
134@@ -196,9 +196,9 @@
135 AC_ARG_ENABLE(ip4, [ --disable-ip4 disable IPv4 support],
136 [case "$enableval" in
137 no) AC_MSG_RESULT(no);;
138- *) AC_DEFINE(WITH_IP4) AC_MSG_RESULT(yes);;
139+ *) AC_DEFINE(WITH_IP4, [1], [with ipv4]) AC_MSG_RESULT(yes);;
140 esac],
141- [AC_DEFINE(WITH_IP4) AC_MSG_RESULT(yes)])
142+ [AC_DEFINE(WITH_IP4, [1], [with ipv4]) AC_MSG_RESULT(yes)])
143
144 AC_MSG_CHECKING(whether to include IPv6 support)
145 AC_ARG_ENABLE(ip6, [ --disable-ip6 disable IPv6 support],
146@@ -209,7 +209,7 @@
147 [ AC_MSG_RESULT(yes); WITH_IP6=1 ])
148 if test "$WITH_IP6"; then
149 AC_CHECK_HEADERS([netinet/ip6.h],
150- [AC_DEFINE(HAVE_NETINET_IP6_H) AC_DEFINE(WITH_IP6)],
151+ [AC_DEFINE(HAVE_NETINET_IP6_H) AC_DEFINE(WITH_IP6, [1], [with ipv6])],
152 [AC_MSG_WARN([include file netinet/ip6.h not found, disabling IP6])],
153 [AC_INCLUDES_DEFAULT
154 #ifdef HAVE_NETINET_IN_H
155@@ -242,17 +242,17 @@
156 AC_ARG_ENABLE(rawip, [ --disable-rawip disable raw IP support],
157 [case "$enableval" in
158 no) AC_MSG_RESULT(no);;
159- *) AC_DEFINE(WITH_RAWIP) AC_MSG_RESULT(yes);;
160+ *) AC_DEFINE(WITH_RAWIP, [1], [With reawip]) AC_MSG_RESULT(yes);;
161 esac],
162- [AC_DEFINE(WITH_RAWIP) AC_MSG_RESULT(yes)])
163+ [AC_DEFINE(WITH_RAWIP, [1], [With rawip]) AC_MSG_RESULT(yes)])
164
165 AC_MSG_CHECKING(whether to include generic socket support)
166 AC_ARG_ENABLE(rawsocket, [ --disable-genericsocket disable generic socket support],
167 [case "$enableval" in
168 no) AC_MSG_RESULT(no);;
169- *) AC_DEFINE(WITH_GENERICSOCKET) AC_MSG_RESULT(yes);;
170+ *) AC_DEFINE(WITH_GENERICSOCKET, [1], [With genericsocket]) AC_MSG_RESULT(yes);;
171 esac],
172- [AC_DEFINE(WITH_GENERICSOCKET) AC_MSG_RESULT(yes)])
173+ [AC_DEFINE(WITH_GENERICSOCKET, [1], [With genericsocket]) AC_MSG_RESULT(yes)])
174 AC_MSG_CHECKING(whether to include raw network interface support)
175 AC_ARG_ENABLE(interface, [ --disable-interface disable network interface support],
176 [case "$enableval" in
177@@ -262,35 +262,35 @@
178 [AC_MSG_RESULT(yes); WITH_INTERFACE=1 ])
179 if test "$WITH_INTERFACE"; then
180 AC_CHECK_HEADER(netpacket/packet.h,
181- AC_DEFINE(HAVE_NETPACKET_PACKET_H),
182+ AC_DEFINE(HAVE_NETPACKET_PACKET_H, [1], [Has packet.h]),
183 [WITH_INTERFACE=;
184 AC_MSG_WARN([include file netpacket/packet.h not found, disabling interface])])
185 fi
186 if test "$WITH_INTERFACE"; then
187 AC_CHECK_HEADER(netinet/if_ether.h,
188- AC_DEFINE(HAVE_NETINET_IF_ETHER_H),
189+ AC_DEFINE(HAVE_NETINET_IF_ETHER_H, [1], [Has if_ether.h]),
190 [WITH_INTERFACE=;
191 AC_MSG_WARN([include file netinet/if_ether.h not found, disabling interface])])
192 fi
193 if test "$WITH_INTERFACE"; then
194- AC_DEFINE(WITH_INTERFACE)
195+ AC_DEFINE(WITH_INTERFACE, [1], [Wither interface])
196 fi
197
198 AC_MSG_CHECKING(whether to include TCP support)
199 AC_ARG_ENABLE(tcp, [ --disable-tcp disable TCP support],
200 [case "$enableval" in
201 no) AC_MSG_RESULT(no);;
202- *) AC_DEFINE(WITH_TCP) AC_MSG_RESULT(yes);;
203+ *) AC_DEFINE(WITH_TCP, [1], [With TCP]) AC_MSG_RESULT(yes);;
204 esac],
205- [AC_DEFINE(WITH_TCP) AC_MSG_RESULT(yes)])
206+ [AC_DEFINE(WITH_TCP, [1], [With TCP]) AC_MSG_RESULT(yes)])
207
208 AC_MSG_CHECKING(whether to include UDP support)
209 AC_ARG_ENABLE(udp, [ --disable-udp disable UDP support],
210 [case "$enableval" in
211 no) AC_MSG_RESULT(no);;
212- *) AC_DEFINE(WITH_UDP) AC_MSG_RESULT(yes);;
213+ *) AC_DEFINE(WITH_UDP, [1], [With UDP]) AC_MSG_RESULT(yes);;
214 esac],
215- [AC_DEFINE(WITH_UDP) AC_MSG_RESULT(yes)])
216+ [AC_DEFINE(WITH_UDP, [1], [With UDP]) AC_MSG_RESULT(yes)])
217
218 AC_MSG_CHECKING(whether to include SCTP support)
219 AC_ARG_ENABLE(sctp, [ --disable-sctp disable SCTP support],
220@@ -310,7 +310,7 @@
221 [sc_cv_define_ipproto_sctp=no])])
222 AC_MSG_RESULT($sc_cv_define_ipproto_sctp)
223 if test $sc_cv_define_ipproto_sctp = yes; then
224- AC_DEFINE(WITH_SCTP)
225+ AC_DEFINE(WITH_SCTP, [1], [With SCTP])
226 else
227 AC_MSG_WARN([IPPROTO_SCTP undefined, disabling SCTP support])
228 fi
229@@ -320,65 +320,65 @@
230 AC_ARG_ENABLE(listen, [ --disable-listen disable listen support],
231 [case "$enableval" in
232 no) AC_MSG_RESULT(no);;
233- *) AC_DEFINE(WITH_LISTEN) AC_MSG_RESULT(yes);;
234+ *) AC_DEFINE(WITH_LISTEN, [1], [With listen]) AC_MSG_RESULT(yes);;
235 esac],
236- [AC_DEFINE(WITH_LISTEN) AC_MSG_RESULT(yes)])
237+ [AC_DEFINE(WITH_LISTEN, [1], [With listen]) AC_MSG_RESULT(yes)])
238
239 AC_MSG_CHECKING(whether to include socks4 support)
240 AC_ARG_ENABLE(socks4, [ --disable-socks4 disable socks4 support],
241 [case "$enableval" in
242 no) AC_MSG_RESULT(no);;
243- *) AC_DEFINE(WITH_SOCKS4) AC_MSG_RESULT(yes);;
244+ *) AC_DEFINE(WITH_SOCKS4, [1], [With socks]) AC_MSG_RESULT(yes);;
245 esac],
246- [AC_DEFINE(WITH_SOCKS4) AC_MSG_RESULT(yes)])
247+ [AC_DEFINE(WITH_SOCKS4, [1], [With socks]) AC_MSG_RESULT(yes)])
248
249 AC_MSG_CHECKING(whether to include socks4a support)
250 AC_ARG_ENABLE(socks4a, [ --disable-socks4a disable socks4a support],
251 [case "$enableval" in
252 no) AC_MSG_RESULT(no);;
253- *) AC_DEFINE(WITH_SOCKS4A) AC_MSG_RESULT(yes);;
254+ *) AC_DEFINE(WITH_SOCKS4A, [1], [With socks4a]) AC_MSG_RESULT(yes);;
255 esac],
256- [AC_DEFINE(WITH_SOCKS4A) AC_MSG_RESULT(yes)])
257+ [AC_DEFINE(WITH_SOCKS4A, [1], [With socks4a]) AC_MSG_RESULT(yes)])
258
259 AC_MSG_CHECKING(whether to include proxy connect support)
260 AC_ARG_ENABLE(proxy, [ --disable-proxy disable proxy connect support],
261 [case "$enableval" in
262 no) AC_MSG_RESULT(no);;
263- *) AC_DEFINE(WITH_PROXY) AC_MSG_RESULT(yes);;
264+ *) AC_DEFINE(WITH_PROXY, [1], [With proxy]) AC_MSG_RESULT(yes);;
265 esac],
266- [AC_DEFINE(WITH_PROXY) AC_MSG_RESULT(yes)])
267+ [AC_DEFINE(WITH_PROXY, [1], [With proxy]) AC_MSG_RESULT(yes)])
268
269 AC_MSG_CHECKING(whether to include exec support)
270 AC_ARG_ENABLE(exec, [ --disable-exec disable exec support],
271 [case "$enableval" in
272 no) AC_MSG_RESULT(no);;
273- *) AC_DEFINE(WITH_EXEC) AC_MSG_RESULT(yes);;
274+ *) AC_DEFINE(WITH_EXEC, [1], [With exec]) AC_MSG_RESULT(yes);;
275 esac],
276- [AC_DEFINE(WITH_EXEC) AC_MSG_RESULT(yes)])
277+ [AC_DEFINE(WITH_EXEC, [1], [With exec]) AC_MSG_RESULT(yes)])
278
279 AC_MSG_CHECKING([whether to include system (shell) support])
280 AC_ARG_ENABLE(system, [ --disable-system disable system (shell) support],
281 [case "$enableval" in
282 no) AC_MSG_RESULT(no);;
283- *) AC_DEFINE(WITH_SYSTEM) AC_MSG_RESULT(yes);;
284+ *) AC_DEFINE(WITH_SYSTEM, [1], [With system]) AC_MSG_RESULT(yes);;
285 esac],
286- [AC_DEFINE(WITH_SYSTEM) AC_MSG_RESULT(yes)])
287+ [AC_DEFINE(WITH_SYSTEM, [1], [With system]) AC_MSG_RESULT(yes)])
288
289 AC_MSG_CHECKING(whether to include pty address support)
290 AC_ARG_ENABLE(pty, [ --disable-pty disable pty support],
291 [case "$enableval" in
292 no) AC_MSG_RESULT(no);;
293- *) AC_DEFINE(WITH_PTY) AC_MSG_RESULT(yes);;
294+ *) AC_DEFINE(WITH_PTY, [1], [With pty]) AC_MSG_RESULT(yes);;
295 esac],
296- [AC_DEFINE(WITH_PTY) AC_MSG_RESULT(yes)])
297+ [AC_DEFINE(WITH_PTY, [1], [With pty]) AC_MSG_RESULT(yes)])
298
299 AC_MSG_CHECKING(whether to include ext2 fs attributes support)
300 AC_ARG_ENABLE(ext2, [ --disable-ext2 disable ext2 fs attributes support],
301 [case "$enableval" in
302 no) AC_MSG_RESULT(no);;
303- *) AC_DEFINE(WITH_EXT2) AC_MSG_RESULT(yes);;
304+ *) AC_DEFINE(WITH_EXT2, [1], [With ext2]) AC_MSG_RESULT(yes);;
305 esac],
306- [AC_DEFINE(WITH_EXT2) AC_MSG_RESULT(yes)])
307+ [AC_DEFINE(WITH_EXT2, [1], [With ext2]) AC_MSG_RESULT(yes)])
308
309 AC_MSG_CHECKING(whether to include readline support)
310 AC_ARG_ENABLE(readline, [ --disable-readline disable readline support],
311@@ -423,10 +423,10 @@
312
313 if test -n "$sc_usable_readline_found"; then
314 AC_MSG_RESULT(yes)
315- AC_DEFINE(HAVE_READLINE_READLINE_H,1)
316- AC_DEFINE(HAVE_READLINE_HISTORY_H,1)
317- AC_DEFINE(HAVE_LIBREADLINE,1)
318- AC_DEFINE(WITH_READLINE,1)
319+ AC_DEFINE(HAVE_READLINE_READLINE_H,1, [have readline])
320+ AC_DEFINE(HAVE_READLINE_HISTORY_H,1, [have history])
321+ AC_DEFINE(HAVE_LIBREADLINE,1, [have readline])
322+ AC_DEFINE(WITH_READLINE,1, [with readline])
323 break
324 else
325 AC_MSG_RESULT(no)
326@@ -469,7 +469,7 @@
327 done])
328 ])
329 if test "$sc_cv_have_openssl_ssl_h" = "yes"; then
330- AC_DEFINE(HAVE_OPENSSL_SSL_H)
331+ AC_DEFINE(HAVE_OPENSSL_SSL_H, [1], [have openssl.h])
332 fi
333 AC_MSG_NOTICE(checked for openssl/ssl.h... $sc_cv_have_openssl_ssl_h)
334 fi # end checking for openssl/ssl.h
335@@ -501,7 +501,7 @@
336 ]
337 )
338 if test "$sc_cv_have_libssl" = 'yes'; then
339- AC_DEFINE(HAVE_LIBSSL)
340+ AC_DEFINE(HAVE_LIBSSL, [1], [libssl])
341 fi
342 AC_MSG_RESULT($sc_cv_have_libssl)
343 fi
344@@ -529,7 +529,7 @@
345 #fi
346 if test -n "$WITH_OPENSSL"; then
347 if test "$sc_cv_have_openssl_ssl_h" = "yes" -a "$sc_cv_have_libssl" = "yes"; then
348- AC_DEFINE(WITH_OPENSSL)
349+ AC_DEFINE(WITH_OPENSSL, [1], [With openssl])
350 else
351 AC_MSG_WARN([not all components of OpenSSL found, disabling it]);
352 fi
353@@ -577,7 +577,7 @@
354 )]
355 )
356 if test "$sv_cv_have_openssl_fips_h" = "yes"; then
357- AC_DEFINE(HAVE_OPENSSL_FIPS_H)
358+ AC_DEFINE(HAVE_OPENSSL_FIPS_H, [1], [OpenSSL fips.h])
359 fi
360 AC_MSG_NOTICE(checked for openssl/fips.h... $sc_cv_have_openssl_ssl_h)
361 fi
362@@ -608,15 +608,15 @@
363 ]
364 )
365 if test "$sc_cv_have_libcrypto" = 'yes'; then
366- AC_DEFINE(HAVE_LIBCRYPTO)
367+ AC_DEFINE(HAVE_LIBCRYPTO, [1], [libcrypto])
368 fi
369 AC_MSG_RESULT($sc_cv_have_libcrypto)
370 fi
371
372 if test -n "$WITH_FIPS"; then
373 if test "$sc_cv_have_openssl_fips_h" = 'yes' -a "$sc_cv_have_libcrypto" = 'yes'; then
374- AC_DEFINE(WITH_FIPS)
375- AC_DEFINE(OPENSSL_FIPS)
376+ AC_DEFINE(WITH_FIPS, [1], [With fips])
377+ AC_DEFINE(OPENSSL_FIPS, [1], [openssl fips])
378 else
379 AC_MSG_WARN([not all components of OpenSSL FIPS found, disabling it]);
380 fi
381@@ -637,17 +637,17 @@
382 fi
383 #
384 if test -n "$WITH_TUN"; then
385- AC_DEFINE(WITH_TUN)
386+ AC_DEFINE(WITH_TUN, [1], [with tun])
387 fi
388
389 AC_MSG_CHECKING(whether to include system call tracing)
390 AC_ARG_ENABLE(sycls, [ --disable-sycls disable system call tracing],
391 [case "$enableval" in
392 no) SYCLS=""; SSLCLS=""; AC_MSG_RESULT(no);;
393- *) AC_DEFINE(WITH_SYCLS)
394+ *) AC_DEFINE(WITH_SYCLS, [1], [syscls])
395 SYCLS="sycls.c"; SSLCLS="sslcls.c"; AC_MSG_RESULT(yes);;
396 esac],
397- [AC_DEFINE(WITH_SYCLS)
398+ [AC_DEFINE(WITH_SYCLS, [1], [syscls])
399 SYCLS="sycls.c"; SSLCLS="sslcls.c"; AC_MSG_RESULT(yes)])
400 AC_SUBST(SYCLS)
401 AC_SUBST(SSLCLS)
402@@ -656,31 +656,31 @@
403 AC_ARG_ENABLE(filan, [ --disable-filan disable file descriptor analyzer],
404 [case "$enableval" in
405 no) FILAN=""; AC_MSG_RESULT(no);;
406- *) AC_DEFINE(WITH_FILAN) FILAN="filan.c"; AC_MSG_RESULT(yes);;
407+ *) AC_DEFINE(WITH_FILAN, [1], [filan]) FILAN="filan.c"; AC_MSG_RESULT(yes);;
408 esac],
409- [AC_DEFINE(WITH_FILAN) FILAN="filan.c"; AC_MSG_RESULT(yes)])
410+ [AC_DEFINE(WITH_FILAN, [1], [filan]) FILAN="filan.c"; AC_MSG_RESULT(yes)])
411 AC_SUBST(FILAN)
412
413 AC_MSG_CHECKING(whether to include retry support)
414 AC_ARG_ENABLE(retry, [ --disable-retry disable retry support],
415 [case "$enableval" in
416 no) AC_MSG_RESULT(no);;
417- *) AC_DEFINE(WITH_RETRY) AC_MSG_RESULT(yes);;
418+ *) AC_DEFINE(WITH_RETRY, [1], [retry]) AC_MSG_RESULT(yes);;
419 esac],
420- [AC_DEFINE(WITH_RETRY) AC_MSG_RESULT(yes)])
421+ [AC_DEFINE(WITH_RETRY, [1], [retry]) AC_MSG_RESULT(yes)])
422
423 AC_MSG_CHECKING(included message level)
424 AC_ARG_ENABLE(msglevel, [ --enable-msglevel=N set max verbosity to debug,info,notice,warn,error,fatal],
425 [case "$enableval" in
426- debug) AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug);;
427- info) AC_DEFINE(WITH_MSGLEVEL,1) AC_MSG_RESULT(info);;
428- notice) AC_DEFINE(WITH_MSGLEVEL,2) AC_MSG_RESULT(notice);;
429- warn) AC_DEFINE(WITH_MSGLEVEL,3) AC_MSG_RESULT(warn);;
430- error) AC_DEFINE(WITH_MSGLEVEL,4) AC_MSG_RESULT(error);;
431- fatal) AC_DEFINE(WITH_MSGLEVEL,5) AC_MSG_RESULT(fatal);;
432- *) AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug);;
433+ debug) AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug);;
434+ info) AC_DEFINE(WITH_MSGLEVEL,1, [msglevel]) AC_MSG_RESULT(info);;
435+ notice) AC_DEFINE(WITH_MSGLEVEL,2, [msglevel]) AC_MSG_RESULT(notice);;
436+ warn) AC_DEFINE(WITH_MSGLEVEL,3, [msglevel]) AC_MSG_RESULT(warn);;
437+ error) AC_DEFINE(WITH_MSGLEVEL,4, [msglevel]) AC_MSG_RESULT(error);;
438+ fatal) AC_DEFINE(WITH_MSGLEVEL,5, [msglevel]) AC_MSG_RESULT(fatal);;
439+ *) AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug);;
440 esac],
441- [AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug)])
442+ [AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug)])
443
444 #AC_SUBST(V_INCL)
445
446@@ -697,7 +697,7 @@
447 AC_HEADER_TIME
448
449 dnl Check for extra realtime library (for Solaris)
450-AC_CHECK_FUNC(nanosleep, AC_DEFINE(HAVE_NANOSLEEP), AC_CHECK_LIB(rt, nanosleep, [LIBS="-lrt $LIBS"; AC_DEFINE(HAVE_NANOSLEEP)]))
451+AC_CHECK_FUNC(nanosleep, AC_DEFINE(HAVE_NANOSLEEP, [1], [have nanosleep]), AC_CHECK_LIB(rt, nanosleep, [LIBS="-lrt $LIBS"; AC_DEFINE(HAVE_NANOSLEEP, [1], [have nanosleep])]))
452 #AC_CHECK_FUNC(nanosleep, , AC_CHECK_LIB(rt, nanosleep))
453
454 dnl Checks for library functions.
455@@ -719,7 +719,7 @@
456 [sc_cv_type_longlong=yes],
457 [sc_cv_type_longlong=no])])
458 if test $sc_cv_type_longlong = yes; then
459- AC_DEFINE(HAVE_TYPE_LONGLONG)
460+ AC_DEFINE(HAVE_TYPE_LONGLONG, [1], [have type long long])
461 fi
462 AC_MSG_RESULT($sc_cv_type_longlong)
463
464@@ -735,7 +735,7 @@
465 [sc_cv_type_socklen=yes],
466 [sc_cv_type_socklen=no])])
467 if test $sc_cv_type_socklen = yes; then
468- AC_DEFINE(HAVE_TYPE_SOCKLEN)
469+ AC_DEFINE(HAVE_TYPE_SOCKLEN, [1], [Has Socklen])
470 fi
471 AC_MSG_RESULT($sc_cv_type_socklen)
472
473@@ -745,7 +745,7 @@
474 [sc_cv_type_stat64=yes],
475 [sc_cv_type_stat64=no])])
476 if test $sc_cv_type_stat64 = yes; then
477- AC_DEFINE(HAVE_TYPE_STAT64)
478+ AC_DEFINE(HAVE_TYPE_STAT64, [1], [Has stat64])
479 fi
480 AC_MSG_RESULT($sc_cv_type_stat64)
481
482@@ -755,7 +755,7 @@
483 [sc_cv_type_off64=yes],
484 [sc_cv_type_off64=no])])
485 if test $sc_cv_type_off64 = yes; then
486- AC_DEFINE(HAVE_TYPE_OFF64)
487+ AC_DEFINE(HAVE_TYPE_OFF64, [1], [have off64])
488 fi
489 AC_MSG_RESULT($sc_cv_type_off64)
490
491@@ -765,7 +765,7 @@
492 [sc_cv_type_sighandler=yes],
493 [sc_cv_type_sighandler=no])])
494 if test $sc_cv_type_sighandler = yes; then
495- AC_DEFINE(HAVE_TYPE_SIGHANDLER)
496+ AC_DEFINE(HAVE_TYPE_SIGHANDLER, [1], [have type sighandler])
497 fi
498 AC_MSG_RESULT($sc_cv_type_socklen)
499
500@@ -783,7 +783,7 @@
501 [sc_cv_type_uint8=yes],
502 [sc_cv_type_uint8=no])])
503 if test $sc_cv_type_uint8 = yes; then
504- AC_DEFINE(HAVE_TYPE_UINT8)
505+ AC_DEFINE(HAVE_TYPE_UINT8, [1], [have uint8])
506 fi
507 AC_MSG_RESULT($sc_cv_type_uint8)
508
509@@ -801,7 +801,7 @@
510 [sc_cv_type_uint16=yes],
511 [sc_cv_type_uint16=no])])
512 if test $sc_cv_type_uint16 = yes; then
513- AC_DEFINE(HAVE_TYPE_UINT16)
514+ AC_DEFINE(HAVE_TYPE_UINT16, [1], [have uint16t])
515 fi
516 AC_MSG_RESULT($sc_cv_type_uint16)
517
518@@ -819,7 +819,7 @@
519 [sc_cv_type_uint32=yes],
520 [sc_cv_type_uint32=no])])
521 if test $sc_cv_type_uint32 = yes; then
522- AC_DEFINE(HAVE_TYPE_UINT32)
523+ AC_DEFINE(HAVE_TYPE_UINT32, [1], [have uint32])
524 fi
525 AC_MSG_RESULT($sc_cv_type_uint32)
526
527@@ -837,7 +837,7 @@
528 [sc_cv_type_uint64=yes],
529 [sc_cv_type_uint64=no])])
530 if test $sc_cv_type_uint64 = yes; then
531- AC_DEFINE(HAVE_TYPE_UINT64)
532+ AC_DEFINE(HAVE_TYPE_UINT64, [1], [have uint64] )
533 fi
534 AC_MSG_RESULT($sc_cv_type_uint64)
535
536@@ -859,7 +859,7 @@
537 #include <sys/select.h>
538 #endif],
539 [fd_set s; s.fds_bits[0]=0;],
540-[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FDS_BITS)],
541+[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FDS_BITS, [1], [have fds bits])],
542 [AC_MSG_RESULT(no);])
543
544 AC_MSG_CHECKING(for sa_family_t)
545@@ -870,7 +870,7 @@
546 [sc_cv_type_sa_family_t=yes],
547 [sc_cv_type_sa_family_t=no])])
548 if test $sc_cv_type_sa_family_t = yes; then
549- AC_DEFINE(HAVE_TYPE_SA_FAMILY_T)
550+ AC_DEFINE(HAVE_TYPE_SA_FAMILY_T, [1], [have sa family_t type])
551 fi
552 AC_MSG_RESULT($sc_cv_type_sa_family_t)
553
554@@ -880,7 +880,7 @@
555 [sc_cv_struct_sigaction_sa_sigaction=yes],
556 [sc_cv_struct_sigaction_sa_sigaction=no])])
557 if test $sc_cv_struct_sigaction_sa_sigaction = yes; then
558- AC_DEFINE(HAVE_STRUCT_SIGACTION_SA_SIGACTION)
559+ AC_DEFINE(HAVE_STRUCT_SIGACTION_SA_SIGACTION, [1], [sigaction])
560 fi
561 AC_MSG_RESULT($sc_cv_struct_sigaction_sa_sigaction)
562
563@@ -888,11 +888,11 @@
564 AC_MSG_CHECKING(for termios.c_ispeed)
565 AC_CACHE_VAL(sc_cv_termios_ispeed,
566 [AC_TRY_COMPILE([#include <termios.h>],
567-[struct termios t; t.c_ispeed=0;],
568+[struct termios t; t.c_ispeed=ISPEED_OFFSET; t.c_ospeed=OSPEED_OFFSET;],
569 [sc_cv_termios_ispeed=yes],
570 [sc_cv_termios_ispeed=no])])
571 if test $sc_cv_termios_ispeed = yes; then
572- AC_DEFINE(HAVE_TERMIOS_ISPEED)
573+ AC_DEFINE(HAVE_TERMIOS_ISPEED, [1], [have ispeed])
574 fi
575 AC_MSG_RESULT($sc_cv_termios_ispeed)
576
577@@ -923,7 +923,7 @@
578 LIBS="$LIBS1"
579 AC_MSG_RESULT($ac_cv_ispeed_offset)
580 if test $ac_cv_ispeed_offset -ge 0; then
581- AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset)
582+ AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset, [have ispeed])
583 fi
584 fi
585
586@@ -942,7 +942,7 @@
587 )]
588 )])
589 if test $ac_cv_svid3 = yes; then
590- AC_DEFINE(_SVID3)
591+ AC_DEFINE(_SVID3, [1], [svid3])
592 fi
593 AC_MSG_RESULT($ac_cv_svid3)
594
595@@ -957,7 +957,7 @@
596 [sc_cv_struct_timespec=yes],
597 [sc_cv_struct_timespec=no])])
598 if test $sc_cv_struct_timespec = yes; then
599- AC_DEFINE(HAVE_STRUCT_TIMESPEC)
600+ AC_DEFINE(HAVE_STRUCT_TIMESPEC, [1], [struct timespec])
601 fi
602 AC_MSG_RESULT($sc_cv_struct_timespec)
603
604@@ -970,7 +970,7 @@
605 [sc_cv_struct_linger=yes],
606 [sc_cv_struct_linger=no])])
607 if test $sc_cv_struct_linger = yes; then
608- AC_DEFINE(HAVE_STRUCT_LINGER)
609+ AC_DEFINE(HAVE_STRUCT_LINGER, [1], [struct linger])
610 fi
611 AC_MSG_RESULT($sc_cv_struct_linger)
612
613@@ -984,7 +984,7 @@
614 [sc_cv_struct_ip_mreq=yes],
615 [sc_cv_struct_ip_mreq=no])])
616 if test $sc_cv_struct_ip_mreq = yes; then
617- AC_DEFINE(HAVE_STRUCT_IP_MREQ)
618+ AC_DEFINE(HAVE_STRUCT_IP_MREQ, [1], [have struct ip mreq])
619 fi
620 AC_MSG_RESULT($sc_cv_struct_ip_mreq)
621
622@@ -997,7 +997,7 @@
623 [sc_cv_struct_ip_mreqn=yes],
624 [sc_cv_struct_ip_mreqn=no])])
625 if test $sc_cv_struct_ip_mreqn = yes; then
626- AC_DEFINE(HAVE_STRUCT_IP_MREQN)
627+ AC_DEFINE(HAVE_STRUCT_IP_MREQN, [1], [have struct ip mreqn])
628 fi
629 AC_MSG_RESULT($sc_cv_struct_ip_mreqn)
630
631@@ -1010,7 +1010,7 @@
632 [sc_cv_struct_ipv6_mreq=yes],
633 [sc_cv_struct_ipv6_mreq=no])])
634 if test $sc_cv_struct_ipv6_mreq = yes; then
635- AC_DEFINE(HAVE_STRUCT_IPV6_MREQ)
636+ AC_DEFINE(HAVE_STRUCT_IPV6_MREQ, [1], [have struct ipv5 mreq])
637 fi
638 AC_MSG_RESULT($sc_cv_struct_ipv6_mreq)
639
640@@ -1024,7 +1024,7 @@
641 [sc_cv_struct_ifreq=yes],
642 [sc_cv_struct_ifreq=no])])
643 if test $sc_cv_struct_ifreq = yes; then
644- AC_DEFINE(HAVE_STRUCT_IFREQ)
645+ AC_DEFINE(HAVE_STRUCT_IFREQ, [1], [have struct ifreq])
646 fi
647 AC_MSG_RESULT($sc_cv_struct_ifreq)
648
649@@ -1039,7 +1039,7 @@
650 [sc_cv_struct_ifreq_ifr_index=yes],
651 [sc_cv_struct_ifreq_ifr_index=no])])
652 if test $sc_cv_struct_ifreq_ifr_index = yes; then
653- AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_INDEX)
654+ AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_INDEX, [1], [have struct ifreq ifr])
655 fi
656 AC_MSG_RESULT($sc_cv_struct_ifreq_ifr_index)
657
658@@ -1054,7 +1054,7 @@
659 [sc_cv_struct_ifreq_ifr_ifindex=yes],
660 [sc_cv_struct_ifreq_ifr_ifindex=no])])
661 if test $sc_cv_struct_ifreq_ifr_ifindex = yes; then
662- AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_IFINDEX)
663+ AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_IFINDEX, [1], [have struct ifreq ifindex])
664 fi
665 AC_MSG_RESULT($sc_cv_struct_ifreq_ifr_ifindex)
666
667@@ -1069,7 +1069,7 @@
668 [sc_cv_struct_sockaddr_salen=yes],
669 [sc_cv_struct_sockaddr_salen=no])])
670 if test $sc_cv_struct_sockaddr_salen = yes; then
671- AC_DEFINE(HAVE_STRUCT_SOCKADDR_SALEN)
672+ AC_DEFINE(HAVE_STRUCT_SOCKADDR_SALEN, [1], [sockaddr salen])
673 fi
674 AC_MSG_RESULT($sc_cv_struct_sockaddr_salen)
675
676@@ -1080,31 +1080,31 @@
677 #include <netinet/in.h>],
678 [struct sockaddr_in6 sa6;sa6.sin6_addr.s6_addr[0]=0;],
679 [AC_MSG_RESULT(s6_addr);
680- AC_DEFINE(HAVE_IP6_SOCKADDR, 0)],
681+ AC_DEFINE(HAVE_IP6_SOCKADDR, 0, [ip6 sockaddr])],
682 [AC_TRY_COMPILE([#include <sys/types.h>
683 #include <netinet/in.h>],
684 [struct sockaddr_in6 sa6;sa6.sin6_addr.u6_addr.u6_addr16[0]=0;],
685 [AC_MSG_RESULT(u6_addr.u6_addr16);
686- AC_DEFINE(HAVE_IP6_SOCKADDR, 1)],
687+ AC_DEFINE(HAVE_IP6_SOCKADDR, 1, [ip6 sockaddr])],
688 [AC_TRY_COMPILE([#include <sys/types.h>
689 #include <netinet/in.h>],
690 [struct sockaddr_in6 sa6;sa6.sin6_addr.u6_addr16[0]=0;],
691- [AC_MSG_RESULT(u6_addr16); AC_DEFINE(HAVE_IP6_SOCKADDR, 2)],
692+ [AC_MSG_RESULT(u6_addr16); AC_DEFINE(HAVE_IP6_SOCKADDR, 2, [ip6 sockaddr])],
693 [AC_TRY_COMPILE([#include <sys/types.h>
694 #include <netinet/in.h>],
695 [struct sockaddr_in6 sa6;sa6.sin6_addr.in6_u.u6_addr16[0]=0;],
696 [AC_MSG_RESULT(in6_u.u6_addr16);
697- AC_DEFINE(HAVE_IP6_SOCKADDR, 3)],
698+ AC_DEFINE(HAVE_IP6_SOCKADDR, 3, [ip6 sockaddr])],
699 [AC_TRY_COMPILE([#include <sys/types.h>
700 #include <netinet/in.h>],
701 [struct sockaddr_in6 sa6;sa6.sin6_addr._S6_un._S6_u32[0]=0;],
702 [AC_MSG_RESULT(_S6_un._S6_u32);
703- AC_DEFINE(HAVE_IP6_SOCKADDR, 4)],
704+ AC_DEFINE(HAVE_IP6_SOCKADDR, 4, [ip6 sockaddr])],
705 [AC_TRY_COMPILE([#include <sys/types.h>
706 #include <netinet/in.h>],
707 [struct sockaddr_in6 sa6;sa6.sin6_addr.__u6_addr.__u6_addr32[0]=0;],
708 [AC_MSG_RESULT(__u6_addr.__u6_addr32);
709- AC_DEFINE(HAVE_IP6_SOCKADDR, 5)],
710+ AC_DEFINE(HAVE_IP6_SOCKADDR, 5, [ip6 sockaddr])],
711
712 [AC_MSG_RESULT([none or unknown])]
713 )])])])])])
714@@ -1116,7 +1116,7 @@
715 [sc_cv_struct_iovec=yes],
716 [sc_cv_struct_iovec=no])])
717 if test $sc_cv_struct_iovec = yes; then
718- AC_DEFINE(HAVE_STRUCT_IOVEC)
719+ AC_DEFINE(HAVE_STRUCT_IOVEC, [1], [have struct iovec])
720 fi
721 AC_MSG_RESULT($sc_cv_struct_iovec)
722
723@@ -1129,7 +1129,7 @@
724 [sc_cv_struct_msghdr_msgcontrol=yes],
725 [sc_cv_struct_msghdr_msgcontrol=no])])
726 if test $sc_cv_struct_msghdr_msgcontrol = yes; then
727- AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROL)
728+ AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROL, [1], [have struct msgcontrol])
729 fi
730 AC_MSG_RESULT($sc_cv_struct_msghdr_msgcontrol)
731
732@@ -1142,7 +1142,7 @@
733 [sc_cv_struct_msghdr_msgcontrollen=yes],
734 [sc_cv_struct_msghdr_msgcontrollen=no])])
735 if test $sc_cv_struct_msghdr_msgcontrollen = yes; then
736- AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROLLEN)
737+ AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROLLEN, [1], [have struct msghdr msgcontrollen])
738 fi
739 AC_MSG_RESULT($sc_cv_struct_msghdr_msgcontrollen)
740
741@@ -1155,7 +1155,7 @@
742 [sc_cv_struct_msghdr_msgflags=yes],
743 [sc_cv_struct_msghdr_msgflags=no])])
744 if test $sc_cv_struct_msghdr_msgflags = yes; then
745- AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGFLAGS)
746+ AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGFLAGS, [1], [msgflags])
747 fi
748 AC_MSG_RESULT($sc_cv_struct_msghdr_msgflags)
749
750@@ -1168,7 +1168,7 @@
751 [sc_cv_struct_cmsghdr=yes],
752 [sc_cv_struct_cmsghdr=no])])
753 if test $sc_cv_struct_cmsghdr = yes; then
754- AC_DEFINE(HAVE_STRUCT_CMSGHDR)
755+ AC_DEFINE(HAVE_STRUCT_CMSGHDR, [1], [have cmshdr])
756 fi
757 AC_MSG_RESULT($sc_cv_struct_cmsghdr)
758
759@@ -1181,7 +1181,7 @@
760 [sc_cv_struct_in_pktinfo=yes],
761 [sc_cv_struct_in_pktinfo=no])])
762 if test $sc_cv_struct_in_pktinfo = yes; then
763- AC_DEFINE(HAVE_STRUCT_IN_PKTINFO)
764+ AC_DEFINE(HAVE_STRUCT_IN_PKTINFO, [1], [pktinfo])
765 fi
766 AC_MSG_RESULT($sc_cv_struct_in_pktinfo)
767
768@@ -1211,7 +1211,7 @@
769 [sc_cv_struct_ip_ip_hl=yes],
770 [sc_cv_struct_ip_ip_hl=no])])
771 if test $sc_cv_struct_ip_ip_hl = yes; then
772- AC_DEFINE(HAVE_STRUCT_IP_IP_HL)
773+ AC_DEFINE(HAVE_STRUCT_IP_IP_HL, [1], [foo])
774 fi
775 AC_MSG_RESULT($sc_cv_struct_ip_ip_hl)
776
777@@ -1219,19 +1219,19 @@
778 dnl Library function checks
779
780 dnl Check sigaction()
781-AC_CHECK_FUNC(sigaction, AC_DEFINE(HAVE_SIGACTION))
782+AC_CHECK_FUNC(sigaction, AC_DEFINE(HAVE_SIGACTION, [1], [foo]))
783
784 dnl Check for 64bit versions of system calls
785-AC_CHECK_FUNC(stat64, AC_DEFINE(HAVE_STAT64))
786-AC_CHECK_FUNC(fstat64, AC_DEFINE(HAVE_FSTAT64))
787-AC_CHECK_FUNC(lstat64, AC_DEFINE(HAVE_LSTAT64))
788-AC_CHECK_FUNC(lseek64, AC_DEFINE(HAVE_LSEEK64))
789-AC_CHECK_FUNC(truncate64, AC_DEFINE(HAVE_TRUNCATE64))
790-AC_CHECK_FUNC(ftruncate64, AC_DEFINE(HAVE_FTRUNCATE64))
791-
792-AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
793-AC_CHECK_FUNC(hstrerror, AC_DEFINE(HAVE_HSTRERROR))
794-AC_CHECK_FUNC(inet_ntop, AC_DEFINE(HAVE_INET_NTOP))
795+AC_CHECK_FUNC(stat64, AC_DEFINE(HAVE_STAT64, [1], [foo]))
796+AC_CHECK_FUNC(fstat64, AC_DEFINE(HAVE_FSTAT64, [1], [foo]))
797+AC_CHECK_FUNC(lstat64, AC_DEFINE(HAVE_LSTAT64, [1], [foo]))
798+AC_CHECK_FUNC(lseek64, AC_DEFINE(HAVE_LSEEK64, [1], [foo]))
799+AC_CHECK_FUNC(truncate64, AC_DEFINE(HAVE_TRUNCATE64, [1], [foo]))
800+AC_CHECK_FUNC(ftruncate64, AC_DEFINE(HAVE_FTRUNCATE64, [1], [foo]))
801+
802+AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL, [1], [foo]))
803+AC_CHECK_FUNC(hstrerror, AC_DEFINE(HAVE_HSTRERROR, [1], [foo]))
804+AC_CHECK_FUNC(inet_ntop, AC_DEFINE(HAVE_INET_NTOP, [1], [foo]))
805
806 #if test "$ac_cv_func_hstrerror" = "yes"; then
807 # AC_MSG_CHECKING(if _XOPEN_SOURCE_EXTENDED is helpful)
808@@ -1254,25 +1254,26 @@
809
810 dnl Search for openpty()
811 # MacOS
812-AC_CHECK_FUNC(openpty, AC_DEFINE(HAVE_OPENPTY))
813+AC_CHECK_FUNC(openpty, AC_DEFINE(HAVE_OPENPTY, [1], [foo]))
814 # AIX
815 AC_CHECK_LIB(bsd, openpty,
816- [LIBS="-lbsd $LIBS"; AC_DEFINE(HAVE_OPENPTY)])
817+ [LIBS="-lbsd $LIBS"; AC_DEFINE(HAVE_OPENPTY, [1], [foo])])
818 # Linux 2.4
819 AC_CHECK_LIB(util, openpty,
820- [LIBS="-lutil $LIBS"; AC_DEFINE(HAVE_OPENPTY)])
821+ [LIBS="-lutil $LIBS"; AC_DEFINE(HAVE_OPENPTY, [1], [foo])])
822+
823
824 dnl Search for flock()
825 # with Linux it's in libc, with AIX in libbsd
826-AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK),
827+AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK, [1], [have flock]),
828 AC_CHECK_LIB(bsd, flock, [LIBS="-lbsd $LIBS"]))
829
830 dnl Search for setenv()
831-AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV),
832+AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV, [1], [have setenv]),
833 AC_CHECK_LIB(isode, setenv, [LIBS="-lisode $LIBS"]))
834
835 dnl Search for unsetenv()
836-AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV))
837+AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV, [1], [have unsetenv]))
838
839 dnl Search for SSLv2_client_method, SSLv2_server_method
840 AC_CHECK_FUNC(SSLv3_client_method, AC_DEFINE(HAVE_SSLv3_client_method), AC_CHECK_LIB(crypt, SSLv3_client_method, [LIBS=-lcrypt $LIBS]))
841@@ -1295,7 +1296,7 @@
842 [ac_cv_have_z_modifier=no],
843 [ac_cv_have_z_modifier=no])])
844 if test $ac_cv_have_z_modifier = yes; then
845- AC_DEFINE(HAVE_FORMAT_Z)
846+ AC_DEFINE(HAVE_FORMAT_Z, [1], [have format z])
847 fi
848 AC_MSG_RESULT($ac_cv_have_z_modifier)
849
850@@ -1334,7 +1335,8 @@
851 [$2=-1]
852 )
853 LIBS="$LIBS1"])
854-AC_DEFINE_UNQUOTED($1_SHIFT, ${$2})
855+SHIFT_NAME="$1"_SHIFT
856+AC_DEFINE_UNQUOTED($SHIFT_NAME, ${$2}, [foo])
857 if test "$2" = -1; then
858 AC_MSG_WARN(please determine $1_SHIFT manually)
859 fi
860@@ -1374,7 +1376,7 @@
861 [$4="0 /* unknown, taking default */"
862 ]) ]) ]) ]) ]) ]) ]) ])
863 CFLAGS="$CFLAGS1" ])
864-AC_DEFINE_UNQUOTED($3, ${$4})
865+AC_DEFINE_UNQUOTED($3, ${$4}, [foo])
866 ])
867
868 dnl find what physical type (basic C type) describes the given struct or union
869@@ -1406,7 +1408,7 @@
870 [$5="0 /* unknown, taking default */"
871 ]) ]) ]) ]) ]) ]) ]) ])
872 CFLAGS="$CFLAGS1" ])
873-AC_DEFINE_UNQUOTED($4, ${$5})
874+AC_DEFINE_UNQUOTED($4, ${$5}, [foo])
875 ])
876
877 AC_BASIC_TYPE([#include <stdlib.h>], size_t, HAVE_BASIC_SIZE_T, sc_cv_type_sizet_basic)
878@@ -1465,13 +1467,13 @@
879
880 AC_MSG_CHECKING(for /dev/ptmx)
881 if test -c /dev/ptmx; then
882- AC_DEFINE(HAVE_DEV_PTMX, 1)
883+ AC_DEFINE(HAVE_DEV_PTMX, 1, [ptmx])
884 AC_MSG_RESULT(yes)
885 else
886 AC_MSG_RESULT(no)
887 AC_MSG_CHECKING(for /dev/ptc)
888 if test -c /dev/ptc; then
889- AC_DEFINE(HAVE_DEV_PTC)
890+ AC_DEFINE(HAVE_DEV_PTC, 1, [ptc])
891 AC_MSG_RESULT(yes)
892 else
893 AC_MSG_RESULT(no)
894@@ -1480,7 +1482,7 @@
895
896 AC_MSG_CHECKING(for /proc)
897 if test -d /proc; then
898- AC_DEFINE(HAVE_PROC_DIR, 1)
899+ AC_DEFINE(HAVE_PROC_DIR, 1, [procdir])
900 AC_MSG_RESULT(yes)
901 else
902 AC_MSG_RESULT(no)
903@@ -1488,7 +1490,7 @@
904
905 AC_MSG_CHECKING(for /proc/*/fd)
906 if test -d /proc/$$/fd; then
907- AC_DEFINE(HAVE_PROC_DIR_FD, 1)
908+ AC_DEFINE(HAVE_PROC_DIR_FD, 1, [procdir fd])
909 AC_MSG_RESULT(yes)
910 else
911 AC_MSG_RESULT(no)
912@@ -1528,7 +1530,7 @@
913 done])
914 ])
915 if test "$sc_cv_have_tcpd_h" = "yes"; then
916- AC_DEFINE(HAVE_TCPD_H)
917+ AC_DEFINE(HAVE_TCPD_H, [1], [have tcpd])
918 fi
919 AC_MSG_NOTICE(checked for tcpd.h... $sc_cv_have_tcpd_h)
920 fi # end checking for tcpd.h
921@@ -1561,14 +1563,14 @@
922 ]
923 )
924 if test "$sc_cv_have_libwrap" = 'yes'; then
925- AC_DEFINE(HAVE_LIBWRAP)
926+ AC_DEFINE(HAVE_LIBWRAP, [1], [libwrap])
927 fi
928 AC_MSG_RESULT($sc_cv_have_libwrap)
929 fi
930 #
931 if test -n "$WITH_LIBWRAP"; then
932 if test "$sc_cv_have_tcpd_h" = "yes" -a "$sc_cv_have_libwrap" = "yes"; then
933- AC_DEFINE(WITH_LIBWRAP)
934+ AC_DEFINE(WITH_LIBWRAP, [1], [libwrap])
935 else
936 AC_MSG_WARN([not all components of tcp wrappers found, disabling it]);
937 fi
938@@ -1583,7 +1585,7 @@
939 [sc_cv_have_hosts_allow_table=yes],
940 [sc_cv_have_hosts_allow_table=no])])
941 if test $sc_cv_have_hosts_allow_table = yes; then
942- AC_DEFINE(HAVE_HOSTS_ALLOW_TABLE)
943+ AC_DEFINE(HAVE_HOSTS_ALLOW_TABLE, [1], [hosts allow table])
944 fi
945 AC_MSG_RESULT($sc_cv_have_hosts_allow_table)
946 fi # test -n "$WITH_LIBWRAP"
diff --git a/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch b/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch
new file mode 100644
index 0000000000..b9d3ca3bab
--- /dev/null
+++ b/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch
@@ -0,0 +1,36 @@
1Fix build during cross-compilation as it fails to detect that our prefixed
2compiler is gcc, and falls back to executing code to determine type sizes:
3
4| configure: using code run method to find basic types
5| checking for equivalent simple type of size_t...
6| configure: error: in `/data/poky-master/tmp/work/core2-32-poky-linux/socat/1.7.2.4-r0/build':
7| configure: error: cannot run test program while cross compiling
8
9This is caused by configure.in assuming that $CC can be literally compared with
10"gcc" to determine if the compiler is GCC. Our gcc is host-prefixed so this
11test fails, however autoconf provides $GCC for this purpose (which was used up
12to 1.7.2.3).
13
14Upstream-Status: Submitted (via email)
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16Signed-off-by: Ross Burton <ross.burton@intel.com>
17
18---
19 configure.in | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/configure.in b/configure.in
23--- a/configure.in
24+++ b/configure.in
25@@ -41,7 +41,7 @@ AC_CHECK_PROG(AR, ar, ar, gar)
26 # fail
27 AC_LANG_COMPILER_REQUIRE()
28
29-if test "$CC" = "gcc"; then
30+if test "$GCC" = yes; then
31 CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses"
32 ERRONWARN="-Werror -O0"
33 elif test "$CC" = "clang"; then
34--
351.8.1.2
36
diff --git a/meta/recipes-connectivity/socat/socat/fix-xxx_SHIFT-autoheader.patch b/meta/recipes-connectivity/socat/socat/fix-xxx_SHIFT-autoheader.patch
deleted file mode 100644
index 44659a0b26..0000000000
--- a/meta/recipes-connectivity/socat/socat/fix-xxx_SHIFT-autoheader.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1Subject: [PATCH] fix autoheader for *_SHIFT values.
2
3Upstream-Status: Pending
4
5autoheader would not generate C `#define' statements if
6the first param of AC_DEFINE_UNQUOTED is a shell variable.
7This will cause build failures while enable termios, so
8expand these AC_DEFINE_UNQUOTED from the macro.
9
10Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
11---
12 configure.in | 5 +++--
13 1 file changed, 3 insertions(+), 2 deletions(-)
14
15diff --git a/configure.in b/configure.in
16index c54e4c4..13bae64 100644
17--- a/configure.in
18+++ b/configure.in
19@@ -1335,8 +1335,6 @@ AC_CACHE_CHECK(shift offset of $1, $2,
20 [$2=-1]
21 )
22 LIBS="$LIBS1"])
23-SHIFT_NAME="$1"_SHIFT
24-AC_DEFINE_UNQUOTED($SHIFT_NAME, ${$2}, [foo])
25 if test "$2" = -1; then
26 AC_MSG_WARN(please determine $1_SHIFT manually)
27 fi
28@@ -1346,6 +1344,9 @@ AC_SHIFT_OFFSET(CRDLY, sc_cv_sys_crdly_shift)
29 AC_SHIFT_OFFSET(TABDLY, sc_cv_sys_tabdly_shift)
30 AC_SHIFT_OFFSET(CSIZE, sc_cv_sys_csize_shift)
31
32+AC_DEFINE_UNQUOTED(CRDLY_SHIFT, ${sc_cv_sys_crdly_shift}, [shift for CRDLY, carriage return delay])
33+AC_DEFINE_UNQUOTED(TABDLY_SHIFT, ${sc_cv_sys_tabdly_shift}, [shift for TABDLY, horizontal tab delay])
34+AC_DEFINE_UNQUOTED(CSIZE_SHIFT, ${sc_cv_sys_csize_shift}, [shift for CSIZE, character size])
35
36 dnl find what physical type (basic C type) is equivalent to the given type.
37 dnl arg1: include file(s)
38--
391.7.9.5
40
diff --git a/meta/recipes-connectivity/socat/socat_1.7.2.3.bb b/meta/recipes-connectivity/socat/socat_1.7.2.4.bb
index 99060b15ae..efa3b91c16 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.2.3.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.2.4.bb
@@ -8,31 +8,28 @@ SECTION = "console/network"
8DEPENDS = "openssl readline" 8DEPENDS = "openssl readline"
9 9
10LICENSE = "GPL-2.0+-with-OpenSSL-exception" 10LICENSE = "GPL-2.0+-with-OpenSSL-exception"
11LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12 file://README;beginline=252;endline=282;md5=79246f11a1db0b6ccec54d1fb711c01e" 12 file://README;beginline=257;endline=287;md5=79246f11a1db0b6ccec54d1fb711c01e"
13 13
14 14
15SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ 15SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
16 file://compile.patch \ 16 file://fix-cross-compiling-failed.patch \
17 file://fix-xxx_SHIFT-autoheader.patch" 17"
18 18
19SRC_URI[md5sum] = "75008d8baf7c6c9e27aa7afb34a622de" 19SRC_URI[md5sum] = "69b8155dd442a6f24e28ef5407d868eb"
20SRC_URI[sha256sum] = "0598ac54af7b138cda9e3c141bcf0cc63eeb2ab31f468a772dc3f7eb3896aad0" 20SRC_URI[sha256sum] = "4b7739901c6fad1e460f3e5b1868fb4c2a1427febbba7a510cd2e42fd4941e09"
21 21
22PACKAGECONFIG ??= "tcp-wrappers" 22inherit autotools
23PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" 23
24EXTRA_AUTORECONF += "--exclude=autoheader"
24 25
25EXTRA_OECONF += "ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9 \ 26EXTRA_OECONF += "ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9 \
26 sc_cv_sys_tabdly_shift=11 sc_cv_sys_csize_shift=4 \ 27 sc_cv_sys_tabdly_shift=11 sc_cv_sys_csize_shift=4 \
27 ac_cv_ispeed_offset=13 \ 28 ac_cv_ispeed_offset=13 \
28" 29"
29 30
30inherit autotools 31PACKAGECONFIG ??= "tcp-wrappers"
31 32PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
32do_configure_prepend() {
33 sed '/AC_DEFINE_UNQUOTED(ISPEED_OFFSET/a\AC_DEFINE(OSPEED_OFFSET,\
34(ISPEED_OFFSET+1)\ ,\ [have\ ospeed\ offset])' -i ${S}/configure.in
35}
36 33
37do_install_prepend () { 34do_install_prepend () {
38 mkdir -p ${D}${bindir} 35 mkdir -p ${D}${bindir}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 19:00:06 +0000