summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-04-07 04:24:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-08 10:53:27 +0100
commit8bdf8b901247412bada91d72cf6620852d050512 (patch)
tree53cda18575880fb019f7ff0b679b09bff1731740
parent7d6f0709c23bb4e40e6faec923e5f159b87db136 (diff)
downloadpoky-8bdf8b901247412bada91d72cf6620852d050512.tar.gz
socat: 1.7.2.4 -> 1.7.3.0
Removed fix-cross-compiling-failed.patch and socat-1.7.2.4-linux-3.17.patch since upstream has fixed them. Updated README's LIC_FILES_CHKSUM, there is a word changed (GPL -> GPLv2, it should be GPLv2 as COPYING shows), its license is already "GPL-2.0+-with-OpenSSL-exception", so we just update the md5 is OK. (From OE-Core rev: 1c09d06ab8694612e1bd5cc63ad660d1e1ea4d64) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch36
-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.3.0.bb (renamed from meta/recipes-connectivity/socat/socat_1.7.2.4.bb)8
3 files changed, 3 insertions, 70 deletions
diff --git a/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch b/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch
deleted file mode 100644
index b9d3ca3bab..0000000000
--- a/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Fix build during cross-compilation as it fails to detect that our prefixed
2compiler is gcc, and falls back to executing code to determine type sizes:
3
4| configure: using code run method to find basic types
5| checking for equivalent simple type of size_t...
6| configure: error: in `/data/poky-master/tmp/work/core2-32-poky-linux/socat/1.7.2.4-r0/build':
7| configure: error: cannot run test program while cross compiling
8
9This is caused by configure.in assuming that $CC can be literally compared with
10"gcc" to determine if the compiler is GCC. Our gcc is host-prefixed so this
11test fails, however autoconf provides $GCC for this purpose (which was used up
12to 1.7.2.3).
13
14Upstream-Status: Submitted (via email)
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16Signed-off-by: Ross Burton <ross.burton@intel.com>
17
18---
19 configure.in | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/configure.in b/configure.in
23--- a/configure.in
24+++ b/configure.in
25@@ -41,7 +41,7 @@ AC_CHECK_PROG(AR, ar, ar, gar)
26 # fail
27 AC_LANG_COMPILER_REQUIRE()
28
29-if test "$CC" = "gcc"; then
30+if test "$GCC" = yes; then
31 CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses"
32 ERRONWARN="-Werror -O0"
33 elif test "$CC" = "clang"; then
34--
351.8.1.2
36
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
deleted file mode 100644
index 9152df533f..0000000000
--- a/meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch
+++ /dev/null
@@ -1,29 +0,0 @@
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.3.0.bb
index 9e43e160e3..8923f41d8c 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.2.4.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.3.0.bb
@@ -9,16 +9,14 @@ DEPENDS = "openssl readline"
9 9
10LICENSE = "GPL-2.0+-with-OpenSSL-exception" 10LICENSE = "GPL-2.0+-with-OpenSSL-exception"
11LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12 file://README;beginline=257;endline=287;md5=79246f11a1db0b6ccec54d1fb711c01e" 12 file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f"
13 13
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 \
17 file://socat-1.7.2.4-linux-3.17.patch \
18" 16"
19 17
20SRC_URI[md5sum] = "69b8155dd442a6f24e28ef5407d868eb" 18SRC_URI[md5sum] = "b607edb65bc6c57f4a43f06247504274"
21SRC_URI[sha256sum] = "4b7739901c6fad1e460f3e5b1868fb4c2a1427febbba7a510cd2e42fd4941e09" 19SRC_URI[sha256sum] = "0767e850c0329b9fdf711c6cd468565cbbb28786ba1a8a1cbd5531d4016b3e04"
22 20
23inherit autotools 21inherit autotools
24 22