diff options
author | Roy.Li <rongqing.li@windriver.com> | 2013-06-06 16:32:50 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-11 15:38:01 +0100 |
commit | 95e23df258184acd54f605bf078e49c32bb657de (patch) | |
tree | 8bb341fc79fd49fc31032caa71f15b825401bd85 /meta/recipes-connectivity/socat/files | |
parent | a3bf47abb4f3c4df65faef28ba52e5fc33301c73 (diff) | |
download | poky-95e23df258184acd54f605bf078e49c32bb657de.tar.gz |
socat: enable termios
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
(From OE-Core rev: fa4d1526f639d50b578ff82b4e65ac45c612bcca)
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/socat/files')
-rw-r--r-- | meta/recipes-connectivity/socat/files/fix-xxx_SHIFT-autoheader.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/socat/files/fix-xxx_SHIFT-autoheader.patch b/meta/recipes-connectivity/socat/files/fix-xxx_SHIFT-autoheader.patch new file mode 100644 index 0000000000..44659a0b26 --- /dev/null +++ b/meta/recipes-connectivity/socat/files/fix-xxx_SHIFT-autoheader.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | Subject: [PATCH] fix autoheader for *_SHIFT values. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | autoheader would not generate C `#define' statements if | ||
6 | the first param of AC_DEFINE_UNQUOTED is a shell variable. | ||
7 | This will cause build failures while enable termios, so | ||
8 | expand these AC_DEFINE_UNQUOTED from the macro. | ||
9 | |||
10 | Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> | ||
11 | --- | ||
12 | configure.in | 5 +++-- | ||
13 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/configure.in b/configure.in | ||
16 | index c54e4c4..13bae64 100644 | ||
17 | --- a/configure.in | ||
18 | +++ b/configure.in | ||
19 | @@ -1335,8 +1335,6 @@ AC_CACHE_CHECK(shift offset of $1, $2, | ||
20 | [$2=-1] | ||
21 | ) | ||
22 | LIBS="$LIBS1"]) | ||
23 | -SHIFT_NAME="$1"_SHIFT | ||
24 | -AC_DEFINE_UNQUOTED($SHIFT_NAME, ${$2}, [foo]) | ||
25 | if test "$2" = -1; then | ||
26 | AC_MSG_WARN(please determine $1_SHIFT manually) | ||
27 | fi | ||
28 | @@ -1346,6 +1344,9 @@ AC_SHIFT_OFFSET(CRDLY, sc_cv_sys_crdly_shift) | ||
29 | AC_SHIFT_OFFSET(TABDLY, sc_cv_sys_tabdly_shift) | ||
30 | AC_SHIFT_OFFSET(CSIZE, sc_cv_sys_csize_shift) | ||
31 | |||
32 | +AC_DEFINE_UNQUOTED(CRDLY_SHIFT, ${sc_cv_sys_crdly_shift}, [shift for CRDLY, carriage return delay]) | ||
33 | +AC_DEFINE_UNQUOTED(TABDLY_SHIFT, ${sc_cv_sys_tabdly_shift}, [shift for TABDLY, horizontal tab delay]) | ||
34 | +AC_DEFINE_UNQUOTED(CSIZE_SHIFT, ${sc_cv_sys_csize_shift}, [shift for CSIZE, character size]) | ||
35 | |||
36 | dnl find what physical type (basic C type) is equivalent to the given type. | ||
37 | dnl arg1: include file(s) | ||
38 | -- | ||
39 | 1.7.9.5 | ||
40 | |||