Skip to contentSkip to conversation

package/freerdp: fix missing define

PATCH New Yann E. MORIN 2 participants 2 messages Oct 4, 2015

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH v2 1/1 package/freerdp: fix missing define

FreeRDP uses CMSPAR, which is defined by glibc in bits/termios.h .

glibc has two flavours of bits/termios.h: a genmeric one and an architecture-specific one. When installing, glibc will install the architecture-specific file if it exists, otherwise it installs the generic file. Only Alpha, MIPS, PPC and Sparc have their own bits/termios.h.

The generic bits/termios.h, as well as the Alpha, PPC and Sparc flavours do define CMSPAR. However, the MIPS flavour does not define it.

We add a patch to FreeRDP that defines CMSPAR to the value from the generic value, which is also the value known to the Linux kernel for MIPS.

Fixes:

    http://autobuild.buildroot.org/results/0b4/0b4793f0bf9f4c57933897f3480054a4e06528ad/
    http://autobuild.buildroot.org/results/7a2/7a2284d0a2987158fa2e78f789b07c8c6fcdb974/
    http://autobuild.buildroot.org/results/387/3874088c3ccd4bbf76ea0c911ca1ef64c7dc9d1c/
    ...
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Peter Korsgaard <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
Changes v1 -> v2:
- add commit log and sob to the patch

---
 package/freerdp/0003-add-missing-define.patch | 44 +++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/freerdp/0003-add-missing-define.patch
package/freerdp/0003-add-missing-define.patch new file +44 -0
new file mode 100644
index 0000000..a8f669e
@@ -0,0 +1,44 @@
+libwinpr/comm_seria: fix missing define
+
+FreeRDP uses CMSPAR, which is defined by glibc in bits/termios.h .
+
+glibc has two flavours of bits/termios.h: a genmeric one and an
+architecture-specific one. When installing, glibc will install the
+architecture-specific file if it exists, otherwise it installs the
+generic file. Only Alpha, MIPS, PPC and Sparc have their own
+bits/termios.h.
+
+The generic bits/termios.h, as well as the Alpha, PPC and Sparc flavours
+do define CMSPAR. However, the MIPS flavour does not define it.
+
+Define CMSPAR to the value from the generic value, which is also the
+value known to the Linux kernel for MIPS.
+
+Fixes:
+    http://autobuild.buildroot.org/results/0b4/0b4793f0bf9f4c57933897f3480054a4e06528ad/
+    http://autobuild.buildroot.org/results/7a2/7a2284d0a2987158fa2e78f789b07c8c6fcdb974/
+    http://autobuild.buildroot.org/results/387/3874088c3ccd4bbf76ea0c911ca1ef64c7dc9d1c/
+    ...
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+Cc: Peter Korsgaard <[email protected]>
+Cc: Thomas Petazzoni <[email protected]>
+
+diff -durN freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16.orig/winpr/libwinpr/comm/comm_serial_sys.c freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16/winpr/libwinpr/comm/comm_serial_sys.c
+--- freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16.orig/winpr/libwinpr/comm/comm_serial_sys.c	2015-09-04 16:20:17.000000000 +0100
++++ freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16/winpr/libwinpr/comm/comm_serial_sys.c	2015-10-04 11:07:41.868513726 +0100
+@@ -27,6 +27,14 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <termios.h>
++
++/* glibc for MIPS has its own bits/termios.h which does not define
++ * CMSPAR, so we vampirise the value from the generic bits/termios.h
++ */
++#ifndef CMSPAR
++#define CMSPAR 010000000000
++#endif
++
+ #include <unistd.h>
+ 
+ #include "comm_serial_sys.h"
Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 1/1 package/freerdp: fix missing define

Quoted 22 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

FreeRDP uses CMSPAR, which is defined by glibc in bits/termios.h . glibc has two flavours of bits/termios.h: a genmeric one and an architecture-specific one. When installing, glibc will install the architecture-specific file if it exists, otherwise it installs the generic file. Only Alpha, MIPS, PPC and Sparc have their own bits/termios.h.

The generic bits/termios.h, as well as the Alpha, PPC and Sparc flavours do define CMSPAR. However, the MIPS flavour does not define it.

We add a patch to FreeRDP that defines CMSPAR to the value from the generic value, which is also the value known to the Linux kernel for MIPS.

Fixes:

    http://autobuild.buildroot.org/results/0b4/0b4793f0bf9f4c57933897f3480054a4e06528ad/
    http://autobuild.buildroot.org/results/7a2/7a2284d0a2987158fa2e78f789b07c8c6fcdb974/
    http://autobuild.buildroot.org/results/387/3874088c3ccd4bbf76ea0c911ca1ef64c7dc9d1c/
    ...
Quoted 7 lines
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Peter Korsgaard <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
Changes v1 -> v2:
- add commit log and sob to the patch

Committed, thanks.

Don't forget to send it upstream as well.

Signature · 1 line
Bye, Peter Korsgaard