Commit 806ca1e7 authored by Peter Seiderer's avatar Peter Seiderer Committed by Peter Korsgaard
Browse files

fbterm: fix musl compile (missing string.h include) 

Fixes [1]:

  mouse.cpp: In function 's32 open_gpm(Gpm_Connect*)':
  mouse.cpp:58:37: error: 'memset' was not declared in this scope
    memset((s8 *)&addr, 0, sizeof(addr));
                                     ^
  mouse.cpp:60:64: error: 'strncpy' was not declared in this scope
    strncpy(addr.sun_path, GPM_NODE_CTL, sizeof(addr.sun_path) - 1);

in case BR2_PACKAGE_GPM is defined.

Add proper gpm dependency and configure option too.

[1] http://autobuild.buildroot.net/results/a60/a602d61e68f662217ad868de79711a8ea892a3a9



Signed-off-by: default avatarPeter Seiderer <ps.report@gmx.net>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 6cd8cbc6

package/fbterm/0002-mouse.cpp-fix-musl-compile.patch

0 → 100644
+30 −0
Original line number Diff line number Diff line 
From a34dba99aff2994269ee347da67feb7ede9b1a67 Mon Sep 17 00:00:00 2001

From: Peter Seiderer <ps.report@gmx.net>

Date: Thu, 18 Feb 2016 22:32:38 +0100

Subject: [PATCH] mouse.cpp: fix musl compile



Add missing include, fixes:



  mouse.cpp:58:37: error: 'memset' was not declared in this scope

  mouse.cpp:60:64: error: 'strncpy' was not declared in this scope



Signed-off-by: Peter Seiderer <ps.report@gmx.net>

---

 src/mouse.cpp | 1 +

 1 file changed, 1 insertion(+)



diff --git a/src/mouse.cpp b/src/mouse.cpp

index 0435dd9..f173137 100644

--- a/src/mouse.cpp

+++ b/src/mouse.cpp

@@ -27,6 +27,7 @@ DEFINE_INSTANCE(Mouse)

 #include <stddef.h>

 #include <unistd.h>

 #include <stdlib.h>

+#include <string.h>

 #include <gpm.h>

 #include <sys/ioctl.h>

 #include <sys/types.h>

-- 

2.1.4

package/fbterm/fbterm.mk

+7 −0
Original line number Diff line number Diff line
@@ -16,4 +16,11 @@ ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy) 
FBTERM_CONF_ENV += LIBS='-lpthread'

endif



ifeq ($(BR2_PACKAGE_GPM),y)

FBTERM_DEPENDENCIES += gpm

FBTERM_CONF_OPTS += --enable-gpm

else

FBTERM_CONF_OPTS += --disable-gpm

endif



$(eval $(autotools-package))