commit:     b2e5c51a6945ba83ebb0cc4cbb195c9b440f52df
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 04:37:26 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 04:37:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e5c51a

sys-apps/busybox: turn off linux-2.4 module support #607548

This fixes static builds.  We can wait for someone who cares about
linux-2.4 kernels to show up to figure out a different solution.

 profiles/package.mask                  | 7 -------
 sys-apps/busybox/busybox-1.26.2.ebuild | 1 +
 sys-apps/busybox/busybox-9999.ebuild   | 1 +
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index cd18010211b..32e36f2f8b4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -375,13 +375,6 @@ games-action/openlierox
 dev-libs/safestr
 dev-libs/xxl
 
-# Michał Górny <[email protected]> (01 Feb 2017)
-# Fails to compile with USE=static. It is a system package, so a lot
-# of people are hitting this. Furthermore, people keep working it around
-# by forcing USE=-static which may defeat its purpose as a rescue tool.
-# Bug #607548.
-=sys-apps/busybox-1.26.2
-
 # Matthias Maier <[email protected]> (31 Jan 2017)
 # Dead upstream (no development since 2010) [1,2], outstanding security
 # issue with newer encfs versions [3], oustanding Gentoo bugs [4,5].

diff --git a/sys-apps/busybox/busybox-1.26.2.ebuild 
b/sys-apps/busybox/busybox-1.26.2.ebuild
index af2ec1b08ef..1feb3a5ac22 100644
--- a/sys-apps/busybox/busybox-1.26.2.ebuild
+++ b/sys-apps/busybox/busybox-1.26.2.ebuild
@@ -112,6 +112,7 @@ src_configure() {
 
        # now turn off stuff we really don't want
        busybox_config_option n DMALLOC
+       busybox_config_option n FEATURE_2_4_MODULES #607548
        busybox_config_option n FEATURE_SUID_CONFIG
        busybox_config_option n BUILD_AT_ONCE
        busybox_config_option n BUILD_LIBBUSYBOX

diff --git a/sys-apps/busybox/busybox-9999.ebuild 
b/sys-apps/busybox/busybox-9999.ebuild
index af2ec1b08ef..1feb3a5ac22 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -112,6 +112,7 @@ src_configure() {
 
        # now turn off stuff we really don't want
        busybox_config_option n DMALLOC
+       busybox_config_option n FEATURE_2_4_MODULES #607548
        busybox_config_option n FEATURE_SUID_CONFIG
        busybox_config_option n BUILD_AT_ONCE
        busybox_config_option n BUILD_LIBBUSYBOX

Reply via email to