summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/socat/files/fix-xxx_SHIFT-autoheader.patch40
-rw-r--r--meta/recipes-connectivity/socat/socat_1.7.2.1.bb15
2 files changed, 52 insertions, 3 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 @@
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
diff --git a/meta/recipes-connectivity/socat/socat_1.7.2.1.bb b/meta/recipes-connectivity/socat/socat_1.7.2.1.bb
index 950e1e5384..43c2d58941 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.2.1.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.2.1.bb
@@ -13,15 +13,24 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
13 13
14PR = "r0" 14PR = "r0"
15SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2;name=src \ 15SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2;name=src \
16 file://compile.patch" 16 file://compile.patch \
17 file://fix-xxx_SHIFT-autoheader.patch"
18
19EXTRA_OECONF += "ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9 \
20 sc_cv_sys_tabdly_shift=11 sc_cv_sys_csize_shift=4 \
21 ac_cv_ispeed_offset=13 \
22"
17 23
18SRC_URI[src.md5sum] = "7ddfea7e9e85f868670f94d3ea08358b" 24SRC_URI[src.md5sum] = "7ddfea7e9e85f868670f94d3ea08358b"
19SRC_URI[src.sha256sum] = "faea2ed6c63bb97a59237fd43b7c35ad248317297e8bfeb2e6f2ec1e6bc58277" 25SRC_URI[src.sha256sum] = "faea2ed6c63bb97a59237fd43b7c35ad248317297e8bfeb2e6f2ec1e6bc58277"
20 26
21EXTRA_OECONF = " --disable-termios "
22
23inherit autotools 27inherit autotools
24 28
29do_configure_prepend() {
30 sed '/AC_DEFINE_UNQUOTED(ISPEED_OFFSET/a\AC_DEFINE(OSPEED_OFFSET,\
31(ISPEED_OFFSET+1)\ ,\ [have\ ospeed\ offset])' -i ${S}/configure.in
32}
33
25do_install_prepend () { 34do_install_prepend () {
26 mkdir -p ${D}${bindir} 35 mkdir -p ${D}${bindir}
27 install -d ${D}${bindir} ${D}${mandir}/man1 36 install -d ${D}${bindir} ${D}${mandir}/man1