forked from pool/socat
Marcus Rueckert
90a92c57ac
update OBS-URL: https://build.opensuse.org/request/show/293117 OBS-URL: https://build.opensuse.org/package/show/network:utilities/socat?expand=0&rev=29
76 lines
2.5 KiB
Diff
76 lines
2.5 KiB
Diff
configure.in: fix linux/errqueue.h not found
|
|
|
|
The do_compile failed:
|
|
...
|
|
|tmp/work/core2-64-poky-linux/socat/1.7.2.4-r0/socat-1.7.2.4/xio-ip.c:
|
|
In function 'xiolog_ancillary_ip':
|
|
|tmp/work/core2-64-poky-linux/socat/1.7.2.4-r0/socat-1.7.2.4/xio-ip.c:520:12:
|
|
error: dereferencing pointer to incomplete type
|
|
| err->ee_errno, '\0', err->ee_origin, '\0', err->ee_type, '\0',
|
|
| ^
|
|
| ake: *** [xio-ip.o] Error 1
|
|
...
|
|
|
|
For 1.7.2.4, the header check of 'linux/errqueue.h ' was not correctly,
|
|
but the old version 1.7.2.3 worked, so we reference 1.7.2.3 to fix this
|
|
issue.
|
|
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
---
|
|
configure.in | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
Index: socat-1.7.2.4/configure.in
|
|
===================================================================
|
|
--- socat-1.7.2.4.orig/configure.in
|
|
+++ socat-1.7.2.4/configure.in
|
|
@@ -80,9 +80,7 @@
|
|
|
|
AC_CHECK_HEADERS(termios.h linux/if_tun.h)
|
|
AC_CHECK_HEADERS(net/if_dl.h)
|
|
-AC_CHECK_HEADERS(linux/types.h)
|
|
-AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include <sys/time.h>
|
|
-#include <linux/types.h>])
|
|
+AC_CHECK_HEADERS(linux/types.h linux/errqueue.h sys/time.h)
|
|
AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h)
|
|
AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h)
|
|
AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h)
|
|
Index: socat-1.7.2.4/configure
|
|
===================================================================
|
|
--- socat-1.7.2.4.orig/configure
|
|
+++ socat-1.7.2.4/configure
|
|
@@ -3980,27 +3980,19 @@
|
|
|
|
done
|
|
|
|
-for ac_header in linux/types.h
|
|
+for ac_header in linux/types.h linux/errqueue.h sys/time.h
|
|
do :
|
|
- ac_fn_c_check_header_mongrel "$LINENO" "linux/types.h" "ac_cv_header_linux_types_h" "$ac_includes_default"
|
|
-if test "x$ac_cv_header_linux_types_h" = xyes; then :
|
|
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
|
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define HAVE_LINUX_TYPES_H 1
|
|
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
_ACEOF
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
-ac_fn_c_check_header_compile "$LINENO" "linux/errqueue.h" "ac_cv_header_linux_errqueue_h" "#include <sys/time.h>
|
|
-#include <linux/types.h>
|
|
-"
|
|
-if test "x$ac_cv_header_linux_errqueue_h" = xyes; then :
|
|
- $as_echo "#define HAVE_LINUX_ERRQUEUE_H 1" >>confdefs.h
|
|
-
|
|
-fi
|
|
-
|
|
-
|
|
for ac_header in sys/utsname.h sys/select.h sys/file.h
|
|
do :
|
|
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|