commit:     ea75b864b15ac5efac481ce901e58014ab05e577
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 22:49:27 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 23:01:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea75b864

sys-apps/busybox: explicitly disable SH_IS_HUSH config option

Otherwise this can hang in certain situations when `make oldconfig` is
called.

 sys-apps/busybox/busybox-1.26.2-r1.ebuild | 1 +
 sys-apps/busybox/busybox-1.27.2.ebuild    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sys-apps/busybox/busybox-1.26.2-r1.ebuild 
b/sys-apps/busybox/busybox-1.26.2-r1.ebuild
index 6c42e41a452..19d62510f28 100644
--- a/sys-apps/busybox/busybox-1.26.2-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.26.2-r1.ebuild
@@ -128,6 +128,7 @@ src_configure() {
        busybox_config_option y ASH
        busybox_config_option y SH_IS_ASH
        busybox_config_option n HUSH
+       busybox_config_option n SH_IS_HUSH
 
        busybox_config_option '"/run"' PID_FILE_PATH
        busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH

diff --git a/sys-apps/busybox/busybox-1.27.2.ebuild 
b/sys-apps/busybox/busybox-1.27.2.ebuild
index 20785227f93..80b530dc184 100644
--- a/sys-apps/busybox/busybox-1.27.2.ebuild
+++ b/sys-apps/busybox/busybox-1.27.2.ebuild
@@ -128,6 +128,7 @@ src_configure() {
        busybox_config_option y ASH
        busybox_config_option y SH_IS_ASH
        busybox_config_option n HUSH
+       busybox_config_option n SH_IS_HUSH
 
        busybox_config_option '"/run"' PID_FILE_PATH
        busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH

Reply via email to