summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/socat/socat/fix-xxx_SHIFT-autoheader.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-xxx_SHIFT-autoheader.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-xxx_SHIFT-autoheader.patch')
-rw-r--r--meta/recipes-connectivity/socat/socat/fix-xxx_SHIFT-autoheader.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-connectivity/socat/socat/fix-xxx_SHIFT-autoheader.patch b/meta/recipes-connectivity/socat/socat/fix-xxx_SHIFT-autoheader.patch
deleted file mode 100644
index 44659a0b26..0000000000
--- a/meta/recipes-connectivity/socat/socat/fix-xxx_SHIFT-autoheader.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1Subject: [PATCH] fix autoheader for *_SHIFT values.
2
3Upstream-Status: Pending
4
5autoheader would not generate C `#define' statements if
6the first param of AC_DEFINE_UNQUOTED is a shell variable.
7This will cause build failures while enable termios, so
8expand these AC_DEFINE_UNQUOTED from the macro.
9
10Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
11---
12 configure.in | 5 +++--
13 1 file changed, 3 insertions(+), 2 deletions(-)
14
15diff --git a/configure.in b/configure.in
16index 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--
391.7.9.5
40