summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch
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 /meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch
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>
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, 0 insertions, 36 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