mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 17:39:31 +00:00
socat: fix compile erorr against 3.17+ kernel headers
With the linux 3.17 kernel socat's configure detects the wrong include for errqueue.h which results in a compilation error. By backporting the gentoo patch from: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch Fixes the build issue (From OE-Core rev: ad83184721be815c6589b53dcf0b469f7fee5c41) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
fc152d9fe7
commit
c219f6b399
@@ -0,0 +1,29 @@
|
|||||||
|
socat: fix compile erorr against 3.17+ kernel headers
|
||||||
|
|
||||||
|
With the linux 3.17 kernel socat's configure detects the wrong include for errqueue.h
|
||||||
|
which results in a compilation error.
|
||||||
|
|
||||||
|
By backporting the gentoo patch from:
|
||||||
|
|
||||||
|
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch
|
||||||
|
|
||||||
|
Fixes the build issue
|
||||||
|
|
||||||
|
Upstream-status: backport
|
||||||
|
|
||||||
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||||
|
|
||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
|
@@ -80,7 +80,10 @@
|
||||||
|
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 <linux/types.h>])
|
||||||
|
+AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [AC_INCLUDES_DEFAULT
|
||||||
|
+ #if HAVE_LINUX_TYPES_H
|
||||||
|
+ #include <linux/types.h>
|
||||||
|
+ #endif])
|
||||||
|
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)
|
||||||
@@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
|||||||
|
|
||||||
SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
|
SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
|
||||||
file://fix-cross-compiling-failed.patch \
|
file://fix-cross-compiling-failed.patch \
|
||||||
|
file://socat-1.7.2.4-linux-3.17.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "69b8155dd442a6f24e28ef5407d868eb"
|
SRC_URI[md5sum] = "69b8155dd442a6f24e28ef5407d868eb"
|
||||||
|
|||||||
Reference in New Issue
Block a user