diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-04-07 04:24:27 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-07 17:32:03 +0100 |
commit | 1c09d06ab8694612e1bd5cc63ad660d1e1ea4d64 (patch) | |
tree | db1b6c4f26eeb4fe3291f09cb383c0c8ca8404ef | |
parent | bd24517116455492abbc429196e5c9db4c1be1c7 (diff) | |
download | openembedded-core-1c09d06ab8694612e1bd5cc63ad660d1e1ea4d64.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.
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.patch | 36 | ||||
-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.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 @@ -Fix build during cross-compilation as it fails to detect that our prefixed -compiler is gcc, and falls back to executing code to determine type sizes: - -| configure: using code run method to find basic types -| checking for equivalent simple type of size_t... -| configure: error: in `/data/poky-master/tmp/work/core2-32-poky-linux/socat/1.7.2.4-r0/build': -| configure: error: cannot run test program while cross compiling - -This is caused by configure.in assuming that $CC can be literally compared with -"gcc" to determine if the compiler is GCC. Our gcc is host-prefixed so this -test fails, however autoconf provides $GCC for this purpose (which was used up -to 1.7.2.3). - -Upstream-Status: Submitted (via email) -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Signed-off-by: Ross Burton <ross.burton@intel.com> - ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -41,7 +41,7 @@ AC_CHECK_PROG(AR, ar, ar, gar) - # fail - AC_LANG_COMPILER_REQUIRE() - --if test "$CC" = "gcc"; then -+if test "$GCC" = yes; then - CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses" - ERRONWARN="-Werror -O0" - elif test "$CC" = "clang"; then --- -1.8.1.2 - 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 @@ -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.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" LICENSE = "GPL-2.0+-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://README;beginline=257;endline=287;md5=79246f11a1db0b6ccec54d1fb711c01e" + file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f" 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" -SRC_URI[sha256sum] = "4b7739901c6fad1e460f3e5b1868fb4c2a1427febbba7a510cd2e42fd4941e09" +SRC_URI[md5sum] = "b607edb65bc6c57f4a43f06247504274" +SRC_URI[sha256sum] = "0767e850c0329b9fdf711c6cd468565cbbb28786ba1a8a1cbd5531d4016b3e04" inherit autotools |