ash's 'kill' builtin depends on the job control config option.
Signed-off-by: Kang-Che Sung <[email protected]>
---
procps/Kbuild.src | 5 +----
procps/kill.c | 3 +--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/procps/Kbuild.src b/procps/Kbuild.src
index 82f37f0df..dedef8881 100644
--- a/procps/Kbuild.src
+++ b/procps/Kbuild.src
@@ -8,8 +8,5 @@ lib-y:=
INSERT
-lib-$(CONFIG_ASH) += kill.o # used for built-in kill by ash
-lib-$(CONFIG_SH_IS_ASH) += kill.o # used for built-in kill by ash
-lib-$(CONFIG_BASH_IS_ASH) += kill.o # used for built-in kill by ash
-
+lib-$(CONFIG_ASH_JOB_CONTROL) += kill.o # used for built-in kill by ash
lib-$(CONFIG_HUSH_KILL) += kill.o # used for built-in kill by hush
diff --git a/procps/kill.c b/procps/kill.c
index 579c8e53c..7c0822542 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -285,8 +285,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
/* Looks like they want to do a kill. Do that */
while (arg) {
-#if ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH \
- || ENABLE_HUSH_KILL
+#if ENABLE_ASH_JOB_CONTROL || ENABLE_HUSH_KILL
/*
* We need to support shell's "hack formats" of
* " -PRGP_ID" (yes, with a leading space)
--
2.11.0
From fc4e247b698fbd656d31e340c649b2cbfcb13f77 Mon Sep 17 00:00:00 2001
From: Kang-Che Sung <[email protected]>
Date: Mon, 9 Jan 2017 22:41:49 +0800
Subject: [PATCH 1/2] Need not build kill.c when ash's job control is off.
ash's 'kill' builtin depends on the job control config option.
Signed-off-by: Kang-Che Sung <[email protected]>
---
procps/Kbuild.src | 5 +----
procps/kill.c | 3 +--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/procps/Kbuild.src b/procps/Kbuild.src
index 82f37f0df..dedef8881 100644
--- a/procps/Kbuild.src
+++ b/procps/Kbuild.src
@@ -8,8 +8,5 @@ lib-y:=
INSERT
-lib-$(CONFIG_ASH) += kill.o # used for built-in kill by ash
-lib-$(CONFIG_SH_IS_ASH) += kill.o # used for built-in kill by ash
-lib-$(CONFIG_BASH_IS_ASH) += kill.o # used for built-in kill by ash
-
+lib-$(CONFIG_ASH_JOB_CONTROL) += kill.o # used for built-in kill by ash
lib-$(CONFIG_HUSH_KILL) += kill.o # used for built-in kill by hush
diff --git a/procps/kill.c b/procps/kill.c
index 579c8e53c..7c0822542 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -285,8 +285,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
/* Looks like they want to do a kill. Do that */
while (arg) {
-#if ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH \
- || ENABLE_HUSH_KILL
+#if ENABLE_ASH_JOB_CONTROL || ENABLE_HUSH_KILL
/*
* We need to support shell's "hack formats" of
* " -PRGP_ID" (yes, with a leading space)
--
2.11.0
_______________________________________________
busybox mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/busybox
