chuck: unbreak musl

This commit is contained in:
Jürgen Buchmüller 2015-10-25 16:01:45 +01:00
parent f37b0062bd
commit e24d1c970d
4 changed files with 62 additions and 1 deletions

View file

@ -0,0 +1,16 @@
In musl libc there is no GLOB_TILDE defined.
--- chuck-1.3.5.2/src/util_string.cpp 2015-10-21 11:04:45.000000000 +0200
+++ chuck-1.3.5.2/src/util_string.cpp 2015-10-25 15:54:10.284686182 +0100
@@ -41,6 +41,11 @@
#endif // __PLATFORM_LINUX__
#include <stdio.h>
+
+#if !defined(__GLIBC__)
+#define GLOB_TILDE 0 // unsupported GNU libc extension
+#endif
+
using namespace std;

View file

@ -0,0 +1,12 @@
PATH_MAX is defined in <limits.h>
--- chuck-1.3.5.2/src/util_serial.cpp 2015-10-21 11:04:45.000000000 +0200
+++ chuck-1.3.5.2/src/util_serial.cpp 2015-10-25 15:57:34.953700938 +0100
@@ -118,6 +118,7 @@
#elif defined(__PLATFORM_LINUX__)
+#include <limits.h>
#include <sys/types.h>
#include <dirent.h>
#include <unistd.h>

View file

@ -0,0 +1,33 @@
The header file <termio.h> is obsolete. Instead use the
header <termios.h> and the struct termios for musl libc.
--- chuck-1.3.5.2/src/util_console.cpp 2015-10-21 11:04:45.000000000 +0200
+++ chuck-1.3.5.2/src/util_console.cpp 2015-10-25 15:50:25.091669947 +0100
@@ -95,9 +95,12 @@
#ifdef __PLATFORM_MACOSX__
#include <termios.h>
static struct termios g_save;
-#else
+#elif defined(__GLIBC__)
#include <termio.h>
static struct termio g_save;
+#else
+ #include <termios.h>
+ static struct termios g_save;
#endif
#include <unistd.h>
@@ -122,9 +125,12 @@
#ifdef __PLATFORM_MACOSX__
struct termios term;
if( ioctl( 0, TIOCGETA, &term ) == -1 )
-#else
+#elif defined(__GLIBC__)
struct termio term;
if( ioctl( 0, TCGETA, &term ) == -1 )
+#else
+ struct termios term;
+ if( ioctl( 0, TCGETA, &term ) == -1 )
#endif
{
EM_log( CK_LOG_SEVERE, "(kbhit disabled): standard input not a tty!");

View file

@ -1,7 +1,7 @@
# Template file for 'chuck'
pkgname=chuck
version=1.3.5.2
revision=1
revision=2
build_wrksrc=src
hostmakedepends="bison flex"
makedepends="jack-devel libsndfile-devel liblo-devel"