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.

diff --git a/profiles/package.mask b/profiles/package.mask
index cd18010211b3da6a03ff03f90933e0165d10ceb1..32e36f2f8b4c48ef78aa6b3c4eb64a1fac4f7be5 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -375,13 +375,6 @@ games-action/openlierox
 dev-libs/safestr
 dev-libs/xxl
 
-# Michał Górny <mgorny@gentoo.org> (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 <tamiko@gentoo.org> (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 af2ec1b08efa384dcf3178268ca58001764d790f..1feb3a5ac229b3dc7bdd47921fbbff9b68f86e9f 100644 (file)
--- 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 af2ec1b08efa384dcf3178268ca58001764d790f..1feb3a5ac229b3dc7bdd47921fbbff9b68f86e9f 100644 (file)
--- 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