summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/mc/mc/mc-CTRL.patch
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2014-08-20 15:15:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-23 23:01:57 +0100
commitc8910783b58548543f4459998abeee76972fc02e (patch)
tree72900cb0055599b21a7ac99b24b2d874cbe52e0b /meta/recipes-extended/mc/mc/mc-CTRL.patch
parent65fa712ae98324bc0182bc23b3bcdb957c3a21d9 (diff)
downloadpoky-c8910783b58548543f4459998abeee76972fc02e.tar.gz
mc: Fix musl build failure
The CTRL macro just needs to be defined. (From OE-Core rev: 27b63e39413b1bc5209270ffcd4888e9a4795ad1) Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/mc/mc/mc-CTRL.patch')
-rw-r--r--meta/recipes-extended/mc/mc/mc-CTRL.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-extended/mc/mc/mc-CTRL.patch b/meta/recipes-extended/mc/mc/mc-CTRL.patch
new file mode 100644
index 0000000000..d532bde9a6
--- /dev/null
+++ b/meta/recipes-extended/mc/mc/mc-CTRL.patch
@@ -0,0 +1,31 @@
1Fix build with musl by ensuring CTRL is defined.
2
3musl does not define CTRL in <termios.h>, we could include <sys/ttydefaults.h>
4explicitly but it's easier just to ensure CTRL is defined.
5
6This patch is taken from Sabotage Linux, the license statement for patches and
7build scripts in Sabotage Linux says:
8
9 To the extent possible under law, Christian Neukirchen has waived
10 all copyright and related or neighboring rights to this work.
11
12 http://creativecommons.org/publicdomain/zero/1.0/
13
14Therefore this should be good to include in OpenEmbedded.
15
16Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
17
18Upstream-status: Pending
19
20diff -u mc-4.8.1.7.org/lib/tty/tty-ncurses.c mc-4.8.1.7/lib/tty/tty-ncurses.c
21--- mc-4.8.1.7.org/lib/tty/tty-ncurses.c
22+++ mc-4.8.1.7/lib/tty/tty-ncurses.c
23@@ -65,7 +65,7 @@
24
25 /*** file scope macro definitions ****************************************************************/
26
27-#if defined(_AIX) && !defined(CTRL)
28+#if !defined(CTRL)
29 #define CTRL(x) ((x) & 0x1f)
30 #endif
31