summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-07 16:11:43 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-08 22:56:45 +0100
commit0a0ffb2ca8655bf0b1bd39ae8b141a548465e63c (patch)
treea6f109a36d0e6e0a7f6c224bcab95e1e2bf9e5c7 /meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch
parent0a219f449a3afe298f6f1bbf06c0cac18e008026 (diff)
downloadpoky-0a0ffb2ca8655bf0b1bd39ae8b141a548465e63c.tar.gz
socat: upgrade 1.7.3.2 -> 1.7.3.3
Remove patches for issues fixed upstream. (From OE-Core rev: e697fe9c109234f914976ccec78a0776aa59d08d) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch')
-rw-r--r--meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch52
1 files changed, 0 insertions, 52 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
deleted file mode 100644
index c0e27f3d78..0000000000
--- a/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From fb10ab134d630705cae0c7be42437cc289af7d32 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 15 Mar 2016 21:36:02 +0000
4Subject: [PATCH] Use __c_ispeed and __c_ospeed on musl
5
6Original intention of these asserts is to find if termios structure
7is mapped correctly to locally define union, the get* APIs for
8baudrate would not do the right thing since they do not return the
9value from c_ospeed/c_ispeed but the value which is stored in iflag
10for baudrate.
11
12So we check if we are on Linux but not using glibc then we use
13__c_ispeed and __c_ospeed as defined in musl, however these are
14internal elements of structs it should not have been used this
15way.
16
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18
19---
20Upstream-Status: Pending
21
22 xioinitialize.c | 7 +++++++
23 1 file changed, 7 insertions(+)
24
25diff --git a/xioinitialize.c b/xioinitialize.c
26index 9f50155..8fb2e4c 100644
27--- a/xioinitialize.c
28+++ b/xioinitialize.c
29@@ -65,6 +65,12 @@ int xioinitialize(void) {
30 #if HAVE_TERMIOS_ISPEED && (ISPEED_OFFSET != -1) && (OSPEED_OFFSET != -1)
31 #if defined(ISPEED_OFFSET) && (ISPEED_OFFSET != -1)
32 #if defined(OSPEED_OFFSET) && (OSPEED_OFFSET != -1)
33+#if defined(__linux__) && !defined(__GLIBC__)
34+ tdata.termarg.__c_ispeed = 0x56789abc;
35+ tdata.termarg.__c_ospeed = 0x6789abcd;
36+ assert(tdata.termarg.__c_ispeed == tdata.speeds[ISPEED_OFFSET]);
37+ assert(tdata.termarg.__c_ospeed == tdata.speeds[OSPEED_OFFSET]);
38+#else
39 tdata.termarg.c_ispeed = 0x56789abc;
40 tdata.termarg.c_ospeed = 0x6789abcd;
41 assert(tdata.termarg.c_ispeed == tdata.speeds[ISPEED_OFFSET]);
42@@ -72,6 +78,7 @@ int xioinitialize(void) {
43 #endif
44 #endif
45 #endif
46+#endif
47 }
48 #endif
49
50--
512.8.0
52