Browse Source

Merge pull request #9414 from neheb/cmdp

cmdpad: Fix compilation with musl
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
b70178cd1e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 3 deletions
  1. +1
    -3
      utils/cmdpad/Makefile
  2. +49
    -0
      utils/cmdpad/patches/150-header.patch

+ 1
- 3
utils/cmdpad/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cmdpad
PKG_VERSION:=0.0.3
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
PKG_SOURCE_URL:=@SF/cmdpad
@ -28,8 +28,6 @@ define Package/cmdpad
URL:=http://cmdpad.sourceforge.net/index.php
endef
TARGET_CFLAGS += -std=gnu89
CONFIGURE_ARGS += \
--enable-static \
--enable-shared


+ 49
- 0
utils/cmdpad/patches/150-header.patch View File

@ -0,0 +1,49 @@
--- a/src/command.c
+++ b/src/command.c
@@ -43,6 +43,7 @@
#include <linux/input.h>
#include <linux/ioctl.h>
+#include <sys/wait.h>
#include <stdlib.h>
#include <fcntl.h>
#include <unistd.h>
--- a/src/main.c
+++ b/src/main.c
@@ -54,6 +54,7 @@
#include "debug.h"
#include "command.h"
+#include "parse.h"
#define DEBUGNAME "MAIN: "
--- a/src/parse.c
+++ b/src/parse.c
@@ -58,7 +58,7 @@
extern char * pchProgramName ;
extern char * pchEventDevice ;
-inline void ltrim( char * pchText)
+static void ltrim( char * pchText)
{
if( pchText) {
char * pchTxt = pchText ;
@@ -67,7 +67,7 @@ inline void ltrim( char * pchText)
}
}
-inline void rtrim( char * pchText)
+static void rtrim( char * pchText)
{
if( pchText)
{
@@ -77,7 +77,7 @@ inline void rtrim( char * pchText)
}
}
-inline void trim( char * pchText)
+static void trim( char * pchText)
{
ltrim( pchText) ;
rtrim( pchText) ;

Loading…
Cancel
Save