Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/scripts/kconfig
- Timestamp:
- Dec 20, 2016, 4:07:32 PM (7 years ago)
- Location:
- branches/3.3
- Files:
-
- 2 deleted
- 5 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/3.3/mindi-busybox/scripts/kconfig/Makefile
r3232 r3621 151 151 HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK 152 152 153 HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` 153 HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl 154 154 HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ 155 155 -D LKC_DIRECT_LINK -
branches/3.3/mindi-busybox/scripts/kconfig/confdata.c
r2725 r3621 125 125 case S_HEX: 126 126 case S_STRING: 127 if (sym->user.val) 128 free(sym->user.val); 127 free(sym->user.val); 129 128 default: 130 129 sym->user.val = NULL; … … 475 474 /* bbox */ 476 475 fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); 477 fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name); 476 fprintf(out_h, "#ifdef MAKE_SUID\n"); 477 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name); 478 fprintf(out_h, "#else\n"); 479 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name); 480 fprintf(out_h, "#endif\n"); 478 481 fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); 479 482 } … … 507 510 /* bbox */ 508 511 fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); 509 fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name); 512 fprintf(out_h, "#ifdef MAKE_SUID\n"); 513 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name); 514 fprintf(out_h, "#else\n"); 515 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name); 516 fprintf(out_h, "#endif\n"); 510 517 fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); 511 518 } … … 519 526 /* bbox */ 520 527 fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); 521 fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name); 528 fprintf(out_h, "#ifdef MAKE_SUID\n"); 529 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name); 530 fprintf(out_h, "#else\n"); 531 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name); 532 fprintf(out_h, "#endif\n"); 522 533 fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); 523 534 } … … 533 544 /* bbox */ 534 545 fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); 535 fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name); 546 fprintf(out_h, "#ifdef MAKE_SUID\n"); 547 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name); 548 fprintf(out_h, "#else\n"); 549 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name); 550 fprintf(out_h, "#endif\n"); 536 551 fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); 537 552 } -
branches/3.3/mindi-busybox/scripts/kconfig/lxdialog/check-lxdialog.sh
r2725 r3621 5 5 ldflags() 6 6 { 7 for ext in so a dylib ; do 7 pkg-config --libs ncursesw 2>/dev/null && exit 8 pkg-config --libs ncurses 2>/dev/null && exit 9 for ext in so a dll.a dylib ; do 8 10 for lib in ncursesw ncurses curses ; do 9 11 $cc -print-file-name=lib${lib}.${ext} | grep -q / … … 20 22 ccflags() 21 23 { 22 if [ -f /usr/include/ncursesw/ncurses.h ]; then 23 echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncurses.h>"' 24 if pkg-config --cflags ncursesw 2>/dev/null; then 25 echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1' 26 elif pkg-config --cflags ncurses 2>/dev/null; then 27 echo '-DCURSES_LOC="<ncurses.h>"' 24 28 elif [ -f /usr/include/ncursesw/curses.h ]; then 25 echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"' 29 echo '-I/usr/include/ncursesw -DCURSES_LOC="<curses.h>"' 30 echo ' -DNCURSES_WIDECHAR=1' 26 31 elif [ -f /usr/include/ncurses/ncurses.h ]; then 27 32 echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"' 28 33 elif [ -f /usr/include/ncurses/curses.h ]; then 29 echo '-I/usr/include/ncurses -DCURSES_LOC="< ncurses/curses.h>"'34 echo '-I/usr/include/ncurses -DCURSES_LOC="<curses.h>"' 30 35 elif [ -f /usr/include/ncurses.h ]; then 31 36 echo '-DCURSES_LOC="<ncurses.h>"' … … 41 46 # Check if we can link to ncurses 42 47 check() { 43 $cc -x c - -o $tmp 2>/dev/null <<'EOF'48 $cc -x c - -o $tmp 2>/dev/null <<'EOF' 44 49 #include CURSES_LOC 45 50 main() {} -
branches/3.3/mindi-busybox/scripts/kconfig/util.c
r2725 r3621 80 80 void str_free(struct gstr *gs) 81 81 { 82 if (gs->s) 83 free(gs->s); 82 free(gs->s); 84 83 gs->s = NULL; 85 84 gs->len = 0; -
branches/3.3/mindi-busybox/scripts/kconfig/zconf.hash.c_shipped
r2725 r3621 33 33 /* maximum key range = 45, duplicates = 0 */ 34 34 35 #ifdef __GNUC__ 36 __inline 37 #else 38 #ifdef __cplusplus 39 inline 40 #endif 41 #endif 42 static unsigned int 35 unsigned int 43 36 kconf_id_hash (register const char *str, register unsigned int len) 44 37 { … … 120 113 char kconf_id_strings_str46[sizeof("prompt")]; 121 114 }; 122 st atic struct kconf_id_strings_t kconf_id_strings_contents =115 struct kconf_id_strings_t kconf_id_strings_contents = 123 116 { 124 117 "if", … … 154 147 }; 155 148 #define kconf_id_strings ((const char *) &kconf_id_strings_contents) 156 #ifdef __GNUC__157 __inline158 #endif159 149 struct kconf_id * 160 150 kconf_id_lookup (register const char *str, register unsigned int len)
Note:
See TracChangeset
for help on using the changeset viewer.