summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch29
-rw-r--r--meta/recipes-connectivity/socat/socat_1.7.2.4.bb1
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 0000000000..9152df533f
--- /dev/null
+++ b/meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch
@@ -0,0 +1,29 @@
1socat: fix compile erorr against 3.17+ kernel headers
2
3With the linux 3.17 kernel socat's configure detects the wrong include for errqueue.h
4which results in a compilation error.
5
6By backporting the gentoo patch from:
7
8 http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch
9
10Fixes the build issue
11
12Upstream-status: backport
13
14Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
15
16--- a/configure.in
17+++ b/configure.in
18@@ -80,7 +80,10 @@
19 AC_CHECK_HEADERS(termios.h linux/if_tun.h)
20 AC_CHECK_HEADERS(net/if_dl.h)
21 AC_CHECK_HEADERS(linux/types.h)
22-AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include <linux/types.h>])
23+AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [AC_INCLUDES_DEFAULT
24+ #if HAVE_LINUX_TYPES_H
25+ #include <linux/types.h>
26+ #endif])
27 AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h)
28 AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h)
29 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 \
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://fix-cross-compiling-failed.patch \ 16 file://fix-cross-compiling-failed.patch \
17 file://socat-1.7.2.4-linux-3.17.patch \
17" 18"
18 19
19SRC_URI[md5sum] = "69b8155dd442a6f24e28ef5407d868eb" 20SRC_URI[md5sum] = "69b8155dd442a6f24e28ef5407d868eb"