emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build system cleanup: rename FEATURE_AWK_MATH to FEATURE_AWK_LIBM;

Browse Source 
disable parsing test applet.
This commit is contained in:
Denis Vlasenko 2008-10-24 10:49:49 +00:00
parent d908395eae
commit 2d5bd807c0
7 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Config.in
View File

@ -494,8 +494,8 @@ config INCLUDE_SUSv2
will be supported in head, tail, and fold. (Note: should will be supported in head, tail, and fold. (Note: should
affect renice too.) affect renice too.)
config PARSE ### config PARSE
bool "Uniform config file parser debugging applet: parse" ### bool "Uniform config file parser debugging applet: parse"
endmenu endmenu

3
TODO_config_nommu
View File

@ -58,7 +58,6 @@ CONFIG_NO_DEBUG_LIB=y
# CONFIG_DMALLOC is not set # CONFIG_DMALLOC is not set
# CONFIG_EFENCE is not set # CONFIG_EFENCE is not set
CONFIG_INCLUDE_SUSv2=y CONFIG_INCLUDE_SUSv2=y
# CONFIG_PARSE is not set
# #
# Installation Options # Installation Options
@ -306,7 +305,7 @@ CONFIG_WHICH=y
# Editors # Editors
# #
CONFIG_AWK=y CONFIG_AWK=y
CONFIG_FEATURE_AWK_MATH=y CONFIG_FEATURE_AWK_LIBM=y
CONFIG_CMP=y CONFIG_CMP=y
CONFIG_DIFF=y CONFIG_DIFF=y
CONFIG_FEATURE_DIFF_BINARY=y CONFIG_FEATURE_DIFF_BINARY=y

2
editors/Config.in
View File

@ -12,7 +12,7 @@ config AWK
Awk is used as a pattern scanning and processing language. This is Awk is used as a pattern scanning and processing language. This is
the BusyBox implementation of that programming language. the BusyBox implementation of that programming language.
config FEATURE_AWK_MATH config FEATURE_AWK_LIBM
bool "Enable math functions (requires libm)" bool "Enable math functions (requires libm)"
default n default n
depends on AWK depends on AWK

8
editors/awk.c
View File

@ -512,7 +512,7 @@ static const char EMSG_TOO_FEW_ARGS[] ALIGN1 = "Too few arguments for builtin";
static const char EMSG_NOT_ARRAY[] ALIGN1 = "Not an array"; static const char EMSG_NOT_ARRAY[] ALIGN1 = "Not an array";
static const char EMSG_POSSIBLE_ERROR[] ALIGN1 = "Possible syntax error"; static const char EMSG_POSSIBLE_ERROR[] ALIGN1 = "Possible syntax error";
static const char EMSG_UNDEF_FUNC[] ALIGN1 = "Call to undefined function"; static const char EMSG_UNDEF_FUNC[] ALIGN1 = "Call to undefined function";
#if !ENABLE_FEATURE_AWK_MATH #if !ENABLE_FEATURE_AWK_LIBM
static const char EMSG_NO_MATH[] ALIGN1 = "Math support is not compiled in"; static const char EMSG_NO_MATH[] ALIGN1 = "Math support is not compiled in";
#endif #endif
@ -2024,7 +2024,7 @@ static var *exec_builtin(node *op, var *res)
switch (info & OPNMASK) { switch (info & OPNMASK) {
case B_a2: case B_a2:
#if ENABLE_FEATURE_AWK_MATH #if ENABLE_FEATURE_AWK_LIBM
setvar_i(res, atan2(getvar_i(av[0]), getvar_i(av[1]))); setvar_i(res, atan2(getvar_i(av[0]), getvar_i(av[1])));
#else #else
syntax_error(EMSG_NO_MATH); syntax_error(EMSG_NO_MATH);
@ -2465,7 +2465,7 @@ static var *evaluate(node *op, var *res)
case F_rn: case F_rn:
R.d = (double)rand() / (double)RAND_MAX; R.d = (double)rand() / (double)RAND_MAX;
break; break;
#if ENABLE_FEATURE_AWK_MATH #if ENABLE_FEATURE_AWK_LIBM
case F_co: case F_co:
R.d = cos(L.d); R.d = cos(L.d);
break; break;
@ -2633,7 +2633,7 @@ static var *evaluate(node *op, var *res)
L.d /= R.d; L.d /= R.d;
break; break;
case '&': case '&':
#if ENABLE_FEATURE_AWK_MATH #if ENABLE_FEATURE_AWK_LIBM
L.d = pow(L.d, R.d); L.d = pow(L.d, R.d);
#else #else
syntax_error(EMSG_NO_MATH); syntax_error(EMSG_NO_MATH);

2
include/applets.h
View File

@ -270,7 +270,7 @@ USE_NOHUP(APPLET(nohup, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_NSLOOKUP(APPLET(nslookup, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_NSLOOKUP(APPLET(nslookup, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_OD(APPLET(od, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_OD(APPLET(od, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_OPENVT(APPLET(openvt, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_OPENVT(APPLET(openvt, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_PARSE(APPLET(parse, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) //USE_PARSE(APPLET(parse, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_PASSWD(APPLET(passwd, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS)) USE_PASSWD(APPLET(passwd, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))
USE_PATCH(APPLET(patch, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_PATCH(APPLET(patch, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_PGREP(APPLET(pgrep, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_PGREP(APPLET(pgrep, _BB_DIR_USR_BIN, _BB_SUID_NEVER))

2
libbb/parse_config.c
View File

@ -9,7 +9,7 @@
#include "libbb.h" #include "libbb.h"
#if ENABLE_PARSE #if defined ENABLE_PARSE && ENABLE_PARSE
int parse_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int parse_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int parse_main(int argc UNUSED_PARAM, char **argv) int parse_main(int argc UNUSED_PARAM, char **argv)
{ {

3
scripts/defconfig
View File

@ -58,7 +58,6 @@ CONFIG_NO_DEBUG_LIB=y
# CONFIG_DMALLOC is not set # CONFIG_DMALLOC is not set
# CONFIG_EFENCE is not set # CONFIG_EFENCE is not set
CONFIG_INCLUDE_SUSv2=y CONFIG_INCLUDE_SUSv2=y
# CONFIG_PARSE is not set
# #
# Installation Options # Installation Options
@ -304,7 +303,7 @@ CONFIG_WHICH=y
# Editors # Editors
# #
CONFIG_AWK=y CONFIG_AWK=y
CONFIG_FEATURE_AWK_MATH=y CONFIG_FEATURE_AWK_LIBM=y
CONFIG_CMP=y CONFIG_CMP=y
CONFIG_DIFF=y CONFIG_DIFF=y
CONFIG_FEATURE_DIFF_BINARY=y CONFIG_FEATURE_DIFF_BINARY=y