From c219f6b399a9764f93f7b60b6fe57104f2eb9d0b Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 18 Dec 2014 14:02:15 -0500 Subject: 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 Signed-off-by: Richard Purdie --- .../socat/socat/socat-1.7.2.4-linux-3.17.patch | 29 ++++++++++++++++++++++ meta/recipes-connectivity/socat/socat_1.7.2.4.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch (limited to 'meta/recipes-connectivity/socat') diff --git a/meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch b/meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch new file mode 100644 index 0000000000..9152df533f --- /dev/null +++ b/meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch @@ -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 + +--- 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 ]) ++AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [AC_INCLUDES_DEFAULT ++ #if HAVE_LINUX_TYPES_H ++ #include ++ #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) diff --git a/meta/recipes-connectivity/socat/socat_1.7.2.4.bb b/meta/recipes-connectivity/socat/socat_1.7.2.4.bb index efa3b91c16..f4461de49e 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.2.4.bb +++ b/meta/recipes-connectivity/socat/socat_1.7.2.4.bb @@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ file://fix-cross-compiling-failed.patch \ + file://socat-1.7.2.4-linux-3.17.patch \ " SRC_URI[md5sum] = "69b8155dd442a6f24e28ef5407d868eb" -- cgit v1.2.3-54-g00ecf