[OE-core] [PATCH 3/3] socat: fix linux/errqueue.h not found
Hongxu Jia
hongxu.jia at windriver.com
Tue May 27 01:59:03 UTC 2014
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.
Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
---
.../socat/fix-linux-errqueue.h-not-found.patch | 40 ++++++++++++++++++++++
meta/recipes-connectivity/socat/socat_1.7.2.4.bb | 1 +
2 files changed, 41 insertions(+)
create mode 100644 meta/recipes-connectivity/socat/socat/fix-linux-errqueue.h-not-found.patch
diff --git a/meta/recipes-connectivity/socat/socat/fix-linux-errqueue.h-not-found.patch b/meta/recipes-connectivity/socat/socat/fix-linux-errqueue.h-not-found.patch
new file mode 100644
index 0000000..3823eaf
--- /dev/null
+++ b/meta/recipes-connectivity/socat/socat/fix-linux-errqueue.h-not-found.patch
@@ -0,0 +1,40 @@
+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 at windriver.com>
+---
+ configure.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 70922f9..bdfbe98 100644
+--- a/configure.in
++++ b/configure.in
+@@ -79,8 +79,7 @@ AC_HEADER_RESOLV()
+
+ 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_HEADERS(linux/types.h linux/errqueue.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)
+--
+1.8.1.2
+
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 6febe5e..777125f 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.2.4.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.2.4.bb
@@ -16,6 +16,7 @@ SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
file://compile.patch \
file://fix-xxx_SHIFT-autoheader.patch \
file://fix-cross-compiling-failed.patch \
+ file://fix-linux-errqueue.h-not-found.patch \
"
--
1.8.1.2
More information about the Openembedded-core
mailing list