From ae642d3fadb83f641034148d833a5c1deb3a1f10 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Sat, 31 May 2014 01:11:55 +0100 Subject: socat: upgrade to 1.7.2.4 socat manually maintains config.h.in instead of using autoheader, so exclude autoheader from autoreconf and remove all patches that are intended to enable use of autoheader. The license checksum changed, because the company address changed. Based on a upgrade by Hongxu Jia , with cleanup after noticing that config.h.in was hand-maintained. (From OE-Core rev: ea3ec30c19af23f6b62ce3d4d9d42c1fcb23a215) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../socat/socat/fix-cross-compiling-failed.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch (limited to 'meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch') diff --git a/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch b/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch new file mode 100644 index 0000000000..b9d3ca3bab --- /dev/null +++ b/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch @@ -0,0 +1,36 @@ +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 +Signed-off-by: Ross Burton + +--- + 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 + -- cgit v1.2.3-54-g00ecf