summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-03-17 05:18:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 22:57:56 +0000
commitcd3408e7b845891b63de04249982330e02f13ee8 (patch)
tree84f3ed1b730048df956bd9db001c2cc14ab58b7b /meta/recipes-connectivity
parent958af8fdc4ebec44a21cbdb6ca76351da7c6fdc0 (diff)
downloadopenembedded-core-cd3408e7b845891b63de04249982330e02f13ee8.tar.gz
openembedded-core-cd3408e7b845891b63de04249982330e02f13ee8.tar.bz2
openembedded-core-cd3408e7b845891b63de04249982330e02f13ee8.zip
socat: Access c_ispeed and c_ospeed via APIs
make it more portable across libc implementations Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch39
-rw-r--r--meta/recipes-connectivity/socat/socat_1.7.3.1.bb1
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch b/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch
new file mode 100644
index 0000000000..367b48f113
--- /dev/null
+++ b/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch
@@ -0,0 +1,39 @@
+From 545d3dec8c91d6074516ffcfa79323ddf9d83839 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 15 Mar 2016 21:36:02 +0000
+Subject: [PATCH] Access c_ispeed and c_ospeed via APIs
+
+Use cfsetispeed(), cfsetospeed(), cfgetispeed, and cfgetospeed()
+instead of operating on c_ispeed and c_ospeed termios structure
+members directly because they are not guaranteed to exist on all
+libc implementations
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Submitted
+
+ xioinitialize.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/xioinitialize.c b/xioinitialize.c
+index 9f50155..632ca4c 100644
+--- a/xioinitialize.c
++++ b/xioinitialize.c
+@@ -65,10 +65,10 @@ int xioinitialize(void) {
+ #if HAVE_TERMIOS_ISPEED && (ISPEED_OFFSET != -1) && (OSPEED_OFFSET != -1)
+ #if defined(ISPEED_OFFSET) && (ISPEED_OFFSET != -1)
+ #if defined(OSPEED_OFFSET) && (OSPEED_OFFSET != -1)
+- tdata.termarg.c_ispeed = 0x56789abc;
+- tdata.termarg.c_ospeed = 0x6789abcd;
+- assert(tdata.termarg.c_ispeed == tdata.speeds[ISPEED_OFFSET]);
+- assert(tdata.termarg.c_ospeed == tdata.speeds[OSPEED_OFFSET]);
++ cfsetispeed(&tdata.termarg, 0x56789abc);
++ cfsetospeed(&tdata.termarg, 0x6789abcd);
++ assert(cfgetispeed(&tdata.termarg) == tdata.speeds[ISPEED_OFFSET]);
++ assert(cfgetospeed(&tdata.termarg) == tdata.speeds[OSPEED_OFFSET]);
+ #endif
+ #endif
+ #endif
+--
+1.9.1
+
diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.1.bb b/meta/recipes-connectivity/socat/socat_1.7.3.1.bb
index b9a8a2fd15..6da9a17b35 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.3.1.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.3.1.bb
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
file://Makefile.in-fix-for-parallel-build.patch \
file://0001-define-NETDB_INTERNAL-to-1-if-not-available.patch \
+ file://0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch \
"
SRC_URI[md5sum] = "334e46924f2b386299c9db2ac22bcd36"