summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-05-31 01:11:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-01 14:30:40 +0100
commitae642d3fadb83f641034148d833a5c1deb3a1f10 (patch)
tree74f033b933a0f72a2671043d19fbeb56191f49dc /meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch
parentfd4a918d88ff07797600af2e4ad514e93dc60267 (diff)
downloadpoky-ae642d3fadb83f641034148d833a5c1deb3a1f10.tar.gz
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 <hongxu.jia@windriver.com>, with cleanup after noticing that config.h.in was hand-maintained. (From OE-Core rev: ea3ec30c19af23f6b62ce3d4d9d42c1fcb23a215) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch')
-rw-r--r--meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch36
1 files changed, 36 insertions, 0 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
new file mode 100644
index 0000000000..b9d3ca3bab
--- /dev/null
+++ b/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch
@@ -0,0 +1,36 @@
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