149748483
Denys Vlasenko
2010-03-23
Subject
ash,hush: make it possible to build them individually
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
applets/applet_tables.c+4 -2
| @@ -79,6 +79,7 @@ int main(int argc, char **argv) | |
| } | |
| printf("\n"); | |
| + | printf("#ifndef SKIP_definitions\n"); |
| printf("const char applet_names[] ALIGN1 = \"\"\n"); | |
| for (i = 0; i < NUM_APPLETS; i++) { | |
| printf("\"%s\" \"\\0\"\n", applets[i].name); | |
| @@ -120,9 +121,10 @@ int main(int argc, char **argv) | |
| printf("0x%02x,\n", v); | |
| i++; | |
| } | |
| - | printf("};\n\n"); |
| + | printf("};\n"); |
| #endif | |
| - | |
| + | printf("#endif /* SKIP_definitions */\n"); |
| + | printf("\n"); |
| printf("#define MAX_APPLET_NAME_LEN %u\n", MAX_APPLET_NAME_LEN); | |
| return 0; | |
shell/ash.c+5 -4
| @@ -43,8 +43,6 @@ | |
| #endif | |
| #include "busybox.h" /* for applet_names */ | |
| - | //TODO: pull in some .h and find out do we have SINGLE_APPLET_MAIN? |
| - | //#include "applet_tables.h" doesn't work |
| #include <paths.h> | |
| #include <setjmp.h> | |
| #include <fnmatch.h> | |
| @@ -59,12 +57,15 @@ | |
| # define CLEAR_RANDOM_T(rnd) ((void)0) | |
| #endif | |
| - | #if defined SINGLE_APPLET_MAIN |
| + | #define SKIP_definitions 1 |
| + | #include "applet_tables.h" |
| + | #undef SKIP_definitions |
| + | #if NUM_APPLETS == 1 |
| /* STANDALONE does not make sense, and won't compile */ | |
| # undef CONFIG_FEATURE_SH_STANDALONE | |
| # undef ENABLE_FEATURE_SH_STANDALONE | |
| # undef IF_FEATURE_SH_STANDALONE | |
| - | # undef IF_NOT_FEATURE_SH_STANDALONE(...) |
| + | # undef IF_NOT_FEATURE_SH_STANDALONE |
| # define ENABLE_FEATURE_SH_STANDALONE 0 | |
| # define IF_FEATURE_SH_STANDALONE(...) | |
| # define IF_NOT_FEATURE_SH_STANDALONE(...) __VA_ARGS__ | |
shell/hush.c+6 -2
| @@ -125,14 +125,18 @@ | |
| # define USE_FOR_MMU(...) | |
| #endif | |
| - | #if defined SINGLE_APPLET_MAIN |
| + | #define SKIP_definitions 1 |
| + | #include "applet_tables.h" |
| + | #undef SKIP_definitions |
| + | #if NUM_APPLETS == 1 |
| /* STANDALONE does not make sense, and won't compile */ | |
| # undef CONFIG_FEATURE_SH_STANDALONE | |
| # undef ENABLE_FEATURE_SH_STANDALONE | |
| # undef IF_FEATURE_SH_STANDALONE | |
| + | # undef IF_NOT_FEATURE_SH_STANDALONE |
| + | # define ENABLE_FEATURE_SH_STANDALONE 0 |
| # define IF_FEATURE_SH_STANDALONE(...) | |
| # define IF_NOT_FEATURE_SH_STANDALONE(...) __VA_ARGS__ | |
| - | # define ENABLE_FEATURE_SH_STANDALONE 0 |
| #endif | |
| #if !ENABLE_HUSH_INTERACTIVE | |