fbterm: fix musl.

This commit is contained in:
Enno Boland 2015-09-03 22:07:52 +02:00
parent 8276537936
commit 2c0811b09e
2 changed files with 52 additions and 1 deletions

View file

@ -0,0 +1,51 @@
--- src/improxy.cpp.orig 2015-09-03 21:53:02.344049550 +0200
+++ src/improxy.cpp 2015-09-03 21:52:56.378049997 +0200
@@ -24,6 +24,7 @@
#include <string.h>
#include <errno.h>
#include <sys/socket.h>
+#include <sys/select.h>
#include "improxy.h"
#include "immessage.h"
#include "fbconfig.h"
--- src/signalfd.h.orig 2015-09-03 21:54:58.500040857 +0200
+++ src/signalfd.h 2015-09-03 21:55:04.521040406 +0200
@@ -20,6 +20,7 @@
#define _SYS_SIGNALFD_H 1
#define __need_sigset_t
+#include <sys/signalfd.h>
#include <signal.h>
#include <stdint.h>
--- src/fbterm.cpp.orig 2015-09-03 22:05:54.491985444 +0200
+++ src/fbterm.cpp 2015-09-03 22:04:51.465990161 +0200
@@ -23,6 +23,8 @@
#include <signal.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
+#include <sys/signalfd.h>
+#include <sys/types.h>
#include <sys/wait.h>
#include <linux/vt.h>
#include <linux/kdev_t.h>
@@ -211,7 +209,7 @@ void FbTerm::processSignal(u32 signo)
case SIGCHLD:
if (mRun) {
- s32 pid = waitpid(WAIT_ANY, 0, WNOHANG);
+ s32 pid = waitpid(-1, 0, WNOHANG);
if (pid > 0) {
FbShellManager::instance()->childProcessExited(pid);
}
--- src/mouse.cpp.orig 2015-09-03 22:00:12.119017385 +0200
+++ src/mouse.cpp 2015-09-03 22:00:21.070016715 +0200
@@ -26,6 +26,7 @@ DEFINE_INSTANCE(Mouse)
#include <stddef.h>
#include <unistd.h>
+#include <string.h>
#include <stdlib.h>
#include <gpm.h>
#include <sys/ioctl.h>

View file

@ -1,7 +1,7 @@
# Template file for 'fbterm'
pkgname=fbterm
version=1.7.0
revision=1
revision=2
wrksrc="${pkgname}-${version%.*}"
build_style=gnu-configure
configure_args="--enable-gpm"