diff options
Diffstat (limited to 'meta/recipes-connectivity/socat')
-rw-r--r-- | meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch | 36 | ||||
-rw-r--r-- | meta/recipes-connectivity/socat/socat_1.7.2.4.bb | 38 |
2 files changed, 74 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 @@ | |||
1 | Fix build during cross-compilation as it fails to detect that our prefixed | ||
2 | compiler 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 | |||
9 | This 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 | ||
11 | test fails, however autoconf provides $GCC for this purpose (which was used up | ||
12 | to 1.7.2.3). | ||
13 | |||
14 | Upstream-Status: Submitted (via email) | ||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
16 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
17 | |||
18 | --- | ||
19 | configure.in | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --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 | -- | ||
35 | 1.8.1.2 | ||
36 | |||
diff --git a/meta/recipes-connectivity/socat/socat_1.7.2.4.bb b/meta/recipes-connectivity/socat/socat_1.7.2.4.bb new file mode 100644 index 0000000000..44d72202ac --- /dev/null +++ b/meta/recipes-connectivity/socat/socat_1.7.2.4.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | SUMMARY = "Multipurpose relay for bidirectional data transfer" | ||
2 | DESCRIPTION = "Socat is a relay for bidirectional data \ | ||
3 | transfer between two independent data channels." | ||
4 | HOMEPAGE = "http://www.dest-unreach.org/socat/" | ||
5 | |||
6 | SECTION = "console/network" | ||
7 | |||
8 | DEPENDS = "openssl readline" | ||
9 | |||
10 | LICENSE = "GPL-2.0+-with-OpenSSL-exception" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
12 | file://README;beginline=257;endline=287;md5=79246f11a1db0b6ccec54d1fb711c01e" | ||
13 | |||
14 | |||
15 | SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ | ||
16 | file://fix-cross-compiling-failed.patch \ | ||
17 | " | ||
18 | |||
19 | SRC_URI[md5sum] = "69b8155dd442a6f24e28ef5407d868eb" | ||
20 | SRC_URI[sha256sum] = "4b7739901c6fad1e460f3e5b1868fb4c2a1427febbba7a510cd2e42fd4941e09" | ||
21 | |||
22 | inherit autotools | ||
23 | |||
24 | EXTRA_AUTORECONF += "--exclude=autoheader" | ||
25 | |||
26 | EXTRA_OECONF += "ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9 \ | ||
27 | sc_cv_sys_tabdly_shift=11 sc_cv_sys_csize_shift=4 \ | ||
28 | ac_cv_ispeed_offset=13 \ | ||
29 | ac_cv_header_bsd_libutil_h=no \ | ||
30 | " | ||
31 | |||
32 | PACKAGECONFIG ??= "tcp-wrappers" | ||
33 | PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" | ||
34 | |||
35 | do_install_prepend () { | ||
36 | mkdir -p ${D}${bindir} | ||
37 | install -d ${D}${bindir} ${D}${mandir}/man1 | ||
38 | } | ||