From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 24 Nov 2016 21:30:52 +0000 (+0100)
Subject: Move FEATURE_BUFFERS_USE_foo options to library tuning
X-Git-Tag: 1_26_0~31
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=24860fa09cf954704232406055d7ca291c636eab;p=oweals%2Fbusybox.git

Move FEATURE_BUFFERS_USE_foo options to library tuning

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/Config.in b/Config.in
index 3d1759e21..924a197da 100644
--- a/Config.in
+++ b/Config.in
@@ -61,30 +61,6 @@ config PLATFORM_LINUX
 	  Answering 'N' here will disable such applets and hide the
 	  corresponding configuration options.
 
-choice
-	prompt "Buffer allocation policy"
-	default FEATURE_BUFFERS_USE_MALLOC
-	help
-	  There are 3 ways BusyBox can handle buffer allocations:
-	  - Use malloc. This costs code size for the call to xmalloc.
-	  - Put them on stack. For some very small machines with limited stack
-	    space, this can be deadly. For most folks, this works just fine.
-	  - Put them in BSS. This works beautifully for computers with a real
-	    MMU (and OS support), but wastes runtime RAM for uCLinux. This
-	    behavior was the only one available for BusyBox versions 0.48 and
-	    earlier.
-
-config FEATURE_BUFFERS_USE_MALLOC
-	bool "Allocate with Malloc"
-
-config FEATURE_BUFFERS_GO_ON_STACK
-	bool "Allocate on the Stack"
-
-config FEATURE_BUFFERS_GO_IN_BSS
-	bool "Allocate in the .bss section"
-
-endchoice
-
 config SHOW_USAGE
 	bool "Show applet usage messages"
 	default y
diff --git a/libbb/Config.src b/libbb/Config.src
index 18a40f2ac..00804e31e 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -7,6 +7,30 @@ menu "Busybox Library Tuning"
 
 INSERT
 
+choice
+	prompt "Buffer allocation policy"
+	default FEATURE_BUFFERS_USE_MALLOC
+	help
+	  There are 3 ways BusyBox can handle buffer allocations:
+	  - Use malloc. This costs code size for the call to xmalloc.
+	  - Put them on stack. For some very small machines with limited stack
+	    space, this can be deadly. For most folks, this works just fine.
+	  - Put them in BSS. This works beautifully for computers with a real
+	    MMU (and OS support), but wastes runtime RAM for uCLinux. This
+	    behavior was the only one available for BusyBox versions 0.48 and
+	    earlier.
+
+config FEATURE_BUFFERS_USE_MALLOC
+	bool "Allocate with Malloc"
+
+config FEATURE_BUFFERS_GO_ON_STACK
+	bool "Allocate on the Stack"
+
+config FEATURE_BUFFERS_GO_IN_BSS
+	bool "Allocate in the .bss section"
+
+endchoice
+
 config PASSWORD_MINLEN
 	int "Minimum password length"
 	default 6