mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-02 09:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

mc: Fix musl build failure

Browse Source 
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>
This commit is contained in:
Paul Barker
2014-08-20 15:15:12 +00:00
committed by Richard Purdie
parent 65fa712ae9
commit c8910783b5
3 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
meta/recipes-extended/mc/mc/mc-CTRL.patch Normal file
View File

@@ -0,0 +1,31 @@
Fix build with musl by ensuring CTRL is defined.
musl does not define CTRL in <termios.h>, we could include <sys/ttydefaults.h>
explicitly but it's easier just to ensure CTRL is defined.
This patch is taken from Sabotage Linux, the license statement for patches and
build scripts in Sabotage Linux says:
To the extent possible under law, Christian Neukirchen has waived
all copyright and related or neighboring rights to this work.
http://creativecommons.org/publicdomain/zero/1.0/
Therefore this should be good to include in OpenEmbedded.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Upstream-status: Pending
diff -u mc-4.8.1.7.org/lib/tty/tty-ncurses.c mc-4.8.1.7/lib/tty/tty-ncurses.c
--- mc-4.8.1.7.org/lib/tty/tty-ncurses.c
+++ mc-4.8.1.7/lib/tty/tty-ncurses.c
@@ -65,7 +65,7 @@
/*** file scope macro definitions ****************************************************************/
-#if defined(_AIX) && !defined(CTRL)
+#if !defined(CTRL)
#define CTRL(x) ((x) & 0x1f)
#endif

4
meta/recipes-extended/mc/mc_4.7.5.2.bb
View File

@@ -8,7 +8,9 @@ RDEPENDS_${PN} = "ncurses-terminfo"
PR = "r3"
SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"
SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
file://mc-CTRL.patch \
"
SRC_URI[md5sum] = "bdae966244496cd4f6d282d80c9cf3c6"
SRC_URI[sha256sum] = "a68338862bb30017eb65ed569a58e80ab66ae8cef11c886440c9e9f4d1efc6ab"

4
meta/recipes-extended/mc/mc_4.8.12.bb
View File

@@ -6,7 +6,9 @@ SECTION = "console/utils"
DEPENDS = "ncurses glib-2.0"
RDEPENDS_${PN} = "ncurses-terminfo"
SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"
SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
file://mc-CTRL.patch \
"
SRC_URI[md5sum] = "a64c426364bfaee56b628f6c0738aade"
SRC_URI[sha256sum] = "1054fcc27a488771cbe5b85d7c10135fa1cd1b7682a19930d44b51a023e39396"