socat: enable termios
v2 cover socat: enable termios
From: "Roy.Li" <[email protected]>
The following changes since commit 9ba812ab1f613d28f9eb3192d2ff1a34dfce33e4:
binutils: fix compile error of complex expressions before @l/@h (2013-06-03 16:46:37 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib roy/socat-v1
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=roy/socat-v1
Roy.Li (1):
socat: enable termios
.../socat/files/fix-xxx_SHIFT-autoheader.patch | 40 ++++++++++++++++++++ meta/recipes-connectivity/socat/socat_1.7.2.1.bb | 15 ++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-connectivity/socat/files/fix-xxx_SHIFT-autoheader.patch
Signature · 1 line
1.7.10.4
PATCH v2 1/1 socat: enable termios
From: "Roy.Li" <[email protected]>
fix two cross-compile issue to enable termios:
1. Define ac_cv_ispeed_offset in EXTRA_OECONF to avoid to call AC_TRY_RUN() on cross-compile environment.
2. fix autoheader to generate *_SHIFT macros
Signed-off-by Roy.Li <[email protected]>
--- .../socat/files/fix-xxx_SHIFT-autoheader.patch | 40 ++++++++++++++++++++ meta/recipes-connectivity/socat/socat_1.7.2.1.bb | 15 ++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-connectivity/socat/files/fix-xxx_SHIFT-autoheader.patch
meta/recipes-connectivity/socat/files/fix-xxx_SHIFT-autoheader.patch new file +40 -0
@@ -0,0 +1,40 @@ +Subject: [PATCH] fix autoheader for *_SHIFT values. + +Upstream-Status: Pending + +autoheader would not generate C `#define' statements if +the first param of AC_DEFINE_UNQUOTED is a shell variable. +This will cause build failures while enable termios, so +expand these AC_DEFINE_UNQUOTED from the macro. + +Signed-off-by: Xin Ouyang <[email protected]> +--- + configure.in | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index c54e4c4..13bae64 100644 +--- a/configure.in ++++ b/configure.in +@@ -1335,8 +1335,6 @@ AC_CACHE_CHECK(shift offset of $1, $2, + [$2=-1] + ) + LIBS="$LIBS1"]) +-SHIFT_NAME="$1"_SHIFT +-AC_DEFINE_UNQUOTED($SHIFT_NAME, ${$2}, [foo]) + if test "$2" = -1; then + AC_MSG_WARN(please determine $1_SHIFT manually) + fi +@@ -1346,6 +1344,9 @@ AC_SHIFT_OFFSET(CRDLY, sc_cv_sys_crdly_shift) + AC_SHIFT_OFFSET(TABDLY, sc_cv_sys_tabdly_shift) + AC_SHIFT_OFFSET(CSIZE, sc_cv_sys_csize_shift) + ++AC_DEFINE_UNQUOTED(CRDLY_SHIFT, ${sc_cv_sys_crdly_shift}, [shift for CRDLY, carriage return delay]) ++AC_DEFINE_UNQUOTED(TABDLY_SHIFT, ${sc_cv_sys_tabdly_shift}, [shift for TABDLY, horizontal tab delay]) ++AC_DEFINE_UNQUOTED(CSIZE_SHIFT, ${sc_cv_sys_csize_shift}, [shift for CSIZE, character size]) + + dnl find what physical type (basic C type) is equivalent to the given type. + dnl arg1: include file(s) +-- +1.7.9.5 +
meta/recipes-connectivity/socat/socat_1.7.2.1.bb +12 -3
@@ -13,15 +13,24 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ PR = "r0" SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2;name=src \ - file://compile.patch" + file://compile.patch \ + file://fix-xxx_SHIFT-autoheader.patch" + +EXTRA_OECONF += "ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9 \ + sc_cv_sys_tabdly_shift=11 sc_cv_sys_csize_shift=4 \ + ac_cv_ispeed_offset=13 \ +" SRC_URI[src.md5sum] = "7ddfea7e9e85f868670f94d3ea08358b" SRC_URI[src.sha256sum] = "faea2ed6c63bb97a59237fd43b7c35ad248317297e8bfeb2e6f2ec1e6bc58277" -EXTRA_OECONF = " --disable-termios " - inherit autotools +do_configure_prepend() { + sed '/AC_DEFINE_UNQUOTED(ISPEED_OFFSET/a\AC_DEFINE(OSPEED_OFFSET,\ +(ISPEED_OFFSET+1)\ ,\ [have\ ospeed\ offset])' -i ${S}/configure.in +} + do_install_prepend () { mkdir -p ${D}${bindir} install -d ${D}${bindir} ${D}${mandir}/man1
Signature · 1 line
1.7.10.4