diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2008-08-20 14:00:34 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2008-08-20 14:00:34 +0000 |
commit | 1e82faaa5e835b00676421b1c63bef541f8ca0d3 (patch) | |
tree | abda8ea9d70f7d10c897cf214028b9037b17f784 /package/busybox/config/Config.in | |
parent | e3d9bc5779a012df82e2c48af3bef81bb011257a (diff) | |
download | master-31e0f0ae-1e82faaa5e835b00676421b1c63bef541f8ca0d3.tar.gz master-31e0f0ae-1e82faaa5e835b00676421b1c63bef541f8ca0d3.tar.bz2 master-31e0f0ae-1e82faaa5e835b00676421b1c63bef541f8ca0d3.zip |
upgrade busybox to v1.11.1 and add current upstream fixes
SVN-Revision: 12348
Diffstat (limited to 'package/busybox/config/Config.in')
-rw-r--r-- | package/busybox/config/Config.in | 90 |
1 files changed, 57 insertions, 33 deletions
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index abeb472dba..62b80d6e3b 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -12,22 +12,6 @@ menu "Busybox Settings" menu "General Configuration" -config BUSYBOX_CONFIG_NITPICK - bool "See lots more (probably unnecessary) configuration options." - default n - help - Some BusyBox applets have more configuration options than anyone - will ever care about. To avoid drowining people in complexity, most - of the applet features that can be set to a sane default value are - hidden, unless you hit the above switch. - - This is better than to telling people to edit the busybox source - code, but not by much. - - See http://en.wikipedia.org/wiki/Fibber_McGee_and_Molly#The_Closet - - You have been warned. - config BUSYBOX_CONFIG_DESKTOP bool "Enable options for full-blown desktop systems" default n @@ -36,10 +20,21 @@ config BUSYBOX_CONFIG_DESKTOP Select this only if you plan to use busybox on full-blown desktop machine with common Linux distro, not on an embedded box. +config BUSYBOX_CONFIG_FEATURE_ASSUME_UNICODE + bool "Assume that 1:1 char/glyph correspondence is not true" + default n + help + This makes various applets aware that one byte is not + one character on screen. + + Busybox aims to eventually work correctly with Unicode displays. + Any older encodings are not guaranteed to work. + Probably by the time when busybox will be fully Unicode-clean, + other encodings will be mainly of historic interest. + choice prompt "Buffer allocation policy" default BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK - depends on BUSYBOX_CONFIG_NITPICK help There are 3 ways BusyBox can handle buffer allocations: - Use malloc. This costs code size for the call to xmalloc. @@ -110,7 +105,7 @@ config BUSYBOX_CONFIG_LOCALE_SUPPORT busybox to support locale settings. config BUSYBOX_CONFIG_GETOPT_LONG - bool "Enable support for --long-options" + bool "Support for --long-options" default y help Enable this if you want busybox applets to use the gnu --long-option @@ -129,7 +124,6 @@ config BUSYBOX_CONFIG_FEATURE_DEVPTS config BUSYBOX_CONFIG_FEATURE_CLEAN_UP bool "Clean up all memory before exiting (usually not needed)" default n - depends on BUSYBOX_CONFIG_NITPICK help As a size optimization, busybox normally exits without explicitly freeing dynamically allocated memory or closing files. This saves @@ -279,10 +273,31 @@ config BUSYBOX_CONFIG_STATIC Most people will leave this set to 'N'. +config BUSYBOX_CONFIG_PIE + bool "Build BusyBox as a position independent executable" + default n + depends on !BUSYBOX_CONFIG_STATIC + help + (TODO: what is it and why/when is it useful?) + Most people will leave this set to 'N'. + +config BUSYBOX_CONFIG_NOMMU + bool "Force NOMMU build" + default n + help + Busybox tries to detect whether architecture it is being + built against supports MMU or not. If this detection fails, + or if you want to build NOMMU version of busybox for testing, + you may force NOMMU build here. + + Most people will leave this set to 'N'. + +# PIE can be made to work with BUILD_LIBBUSYBOX, but currently +# build system does not support that config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX bool "Build shared libbusybox" default n - depends on !BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS + depends on !BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS && !BUSYBOX_CONFIG_PIE && !BUSYBOX_CONFIG_STATIC help Build a shared library libbusybox.so.N.N.N which contains all busybox code. @@ -369,6 +384,16 @@ config BUSYBOX_CONFIG_LFS cp, mount, tar, and many others. If you want to access files larger than 2 Gigabytes, enable this option. Otherwise, leave it set to 'N'. +config BUSYBOX_CONFIG_CROSS_COMPILER_PREFIX + string "Cross Compiler prefix" + default "" + help + If you want to build BusyBox with a cross compiler, then you + will need to set this to the cross-compiler prefix, for example, + "i386-uclibc-". Note that CROSS_COMPILE environment variable + or "make CROSS_COMPILE=xxx ..." will override this selection. + For native build leave it empty. + endmenu menu 'Debugging Options' @@ -384,6 +409,17 @@ config BUSYBOX_CONFIG_DEBUG Most people should answer N. +config BUSYBOX_CONFIG_DEBUG_PESSIMIZE + bool "Disable compiler optimizations." + default n + depends on BUSYBOX_CONFIG_DEBUG + help + The compiler's optimization of source code can eliminate and reorder + code, resulting in an executable that's hard to understand when + stepping through it with a debugger. This switches it off, resulting + in a much bigger executable that more closely matches the source + code. + config BUSYBOX_CONFIG_WERROR bool "Abort compilation on any warning" default n @@ -392,18 +428,6 @@ config BUSYBOX_CONFIG_WERROR Most people should answer N. -# Seems to be unused -#config DEBUG_PESSIMIZE -# bool "Disable compiler optimizations." -# default n -# depends on DEBUG -# help -# The compiler's optimization of source code can eliminate and reorder -# code, resulting in an executable that's hard to understand when -# stepping through it with a debugger. This switches it off, resulting -# in a much bigger executable that more closely matches the source -# code. - choice prompt "Additional debugging library" default BUSYBOX_CONFIG_NO_DEBUG_LIB @@ -554,4 +578,4 @@ source package/busybox/config/shell/Config.in source package/busybox/config/sysklogd/Config.in source package/busybox/config/runit/Config.in source package/busybox/config/selinux/Config.in -source package/busybox/config/ipsvd/Config.in +source package/busybox/config/printutils/Config.in |