From 1a8481bf1512c78f000ea573e8016dd732661a16 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 22 Aug 2020 14:07:29 -0700 Subject: [PATCH] klish: fixup sigignore support Added _GNU_SOURCE for uClibc-ng compatibility. _XOPEN_SOURCE does not seem to be enough. Signed-off-by: Rosen Penev --- utils/klish/Makefile | 4 +++- utils/klish/patches/010-shell_execute_fix.patch | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/klish/Makefile b/utils/klish/Makefile index e510291b04..17e813375a 100644 --- a/utils/klish/Makefile +++ b/utils/klish/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=klish PKG_VERSION:=2.2.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://libcode.org/attachments/download/77/ @@ -54,6 +54,8 @@ endef CONFIGURE_ARGS += --with-libxml2 +TARGET_CFLAGS += -D_GNU_SOURCE + define Package/klish/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/clish $(1)/usr/bin/ diff --git a/utils/klish/patches/010-shell_execute_fix.patch b/utils/klish/patches/010-shell_execute_fix.patch index 8de164e52d..f74e91c4bb 100644 --- a/utils/klish/patches/010-shell_execute_fix.patch +++ b/utils/klish/patches/010-shell_execute_fix.patch @@ -6,12 +6,10 @@ +#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 int sigignore(int signo) + static void sigignore(int signo) { signo = signo; /* Happy compiler */ -- return; -+ return 0; + return; } +#endif