diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-12-18 14:02:15 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-20 14:02:09 +0000 |
| commit | ad83184721be815c6589b53dcf0b469f7fee5c41 (patch) | |
| tree | f4adec43c76b17b051e0362b147f615f40dc1eab /meta/recipes-connectivity/socat | |
| parent | 8c30cec8233605cbec334fcc5c2b9ef5cf8f6482 (diff) | |
| download | openembedded-core-contrib-ad83184721be815c6589b53dcf0b469f7fee5c41.tar.gz | |
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
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/socat')
| -rw-r--r-- | meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-connectivity/socat/socat_1.7.2.4.bb | 1 |
2 files changed, 30 insertions, 0 deletions
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 00000000000..9152df533f4 --- /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 <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) 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 efa3b91c16a..f4461de49e2 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" |