Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

klish: fix compilation with uClibc-ng

Browse source 
sigignore is missing from libc.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-08-13 19:30:30 -07:00
parent d8d06cfca2
commit 86c478bd76
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
utils/klish/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=klish PKG_NAME:=klish
PKG_VERSION:=2.2.0 PKG_VERSION:=2.2.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://libcode.org/attachments/download/77/ PKG_SOURCE_URL:=http://libcode.org/attachments/download/77/
@ -54,8 +54,6 @@ endef
CONFIGURE_ARGS += --with-libxml2 CONFIGURE_ARGS += --with-libxml2
TARGET_CFLAGS += -D_XOPEN_SOURCE=500
define Package/klish/install define Package/klish/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/clish $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/clish $(1)/usr/bin/

17
utils/klish/patches/010-shell_execute_fix.patch
View file

@ -1,16 +1,19 @@
--- a/clish/shell/shell_execute.c --- a/clish/shell/shell_execute.c
+++ b/clish/shell/shell_execute.c +++ b/clish/shell/shell_execute.c
@@ -19,13 +19,6 @@ @@ -19,12 +19,14 @@
#include <signal.h> #include <signal.h>
#include <fcntl.h> #include <fcntl.h>
-/* Empty signal handler to ignore signal but don't use SIG_IGN. */ +#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_OBSOLETE_BSD_SIGNAL__)
/* Empty signal handler to ignore signal but don't use SIG_IGN. */
-static void sigignore(int signo) -static void sigignore(int signo)
-{ +static int sigignore(int signo)
- signo = signo; /* Happy compiler */ {
signo = signo; /* Happy compiler */
- return; - return;
-} + return 0;
- }
+#endif
/*-------------------------------------------------------- */ /*-------------------------------------------------------- */
static int clish_shell_lock(const char *lock_path) static int clish_shell_lock(const char *lock_path)
{