\\ against scripts/kconfig from linux-2.6.37 diff -rdup kconfig.oorig/lex.zconf.c kconfig/lex.zconf.c --- kconfig.oorig/lex.zconf.c 2011-01-05 20:53:18.761727160 +0100 +++ kconfig/lex.zconf.c 2011-01-07 18:36:21.334372013 +0100 @@ -393,12 +393,12 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, 16, 16, 17, 16, 16, 16, 16, 16, 16, - 16, 16, 16, 18, 16, 16, 16 + 16, 18, 16, 16, 16, 16, 16 }, { 11, 16, 16, 17, 16, 16, 16, 16, 16, 16, - 16, 16, 16, 18, 16, 16, 16 + 16, 18, 16, 16, 16, 16, 16 }, @@ -424,13 +424,13 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, 26, 26, 27, 28, 29, 30, 31, 29, 32, - 33, 34, 35, 35, 36, 37, 38 + 33, 34, 35, 34, 36, 37, 38 }, { 11, 26, 26, 27, 28, 29, 30, 31, 29, 32, - 33, 34, 35, 35, 36, 37, 38 + 33, 34, 35, 34, 36, 37, 38 }, { @@ -471,7 +471,7 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, -18, -18, -18, -18, -18, -18, -18, -18, -18, - -18, -18, -18, 44, -18, -18, -18 + -18, 44, -18, -18, -18, -18, -18 }, { @@ -554,13 +554,13 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, -34, -34, -34, -34, -34, -34, -34, -34, -34, - -34, 56, 57, 57, -34, -34, -34 + -34, 56, 56, 56, -34, -34, -34 }, { 11, -35, -35, -35, -35, -35, -35, -35, -35, -35, - -35, 57, 57, 57, -35, -35, -35 + -35, 56, 57, 56, -35, -35, -35 }, { @@ -606,7 +606,7 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, -44, -44, -44, -44, -44, -44, -44, -44, -44, - -44, -44, -44, 44, -44, -44, -44 + -44, 44, -44, -44, -44, -44, -44 }, @@ -669,12 +669,12 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, -56, -56, -56, -56, -56, -56, -56, -56, -56, - -56, 60, 57, 57, -56, -56, -56 + -56, 56, 56, 56, -56, -56, -56 }, { 11, -57, -57, -57, -57, -57, -57, -57, -57, -57, - -57, 57, 57, 57, -57, -57, -57 + -57, 56, 60, 56, -57, -57, -57 }, { @@ -690,7 +690,7 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, -60, -60, -60, -60, -60, -60, -60, -60, -60, - -60, 57, 57, 57, -60, -60, -60 + -60, 56, 56, 56, -60, -60, -60 }, } ; @@ -735,16 +735,16 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, 5, 6, 1, 1, 7, 8, 9, - 10, 1, 1, 1, 11, 12, 12, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 1, 1, 1, - 14, 1, 1, 1, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 1, 15, 1, 1, 13, 1, 13, 13, 13, 13, + 10, 1, 11, 1, 12, 13, 13, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 1, 1, 1, + 14, 1, 1, 1, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 1, 15, 1, 1, 11, 1, 11, 11, 11, 11, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 1, 16, 1, 1, 1, 1, 1, 1, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 1, 16, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, diff -rdup kconfig.oorig/lex.zconf.c_shipped kconfig/lex.zconf.c_shipped --- kconfig.oorig/lex.zconf.c_shipped 2011-01-05 01:50:19.000000000 +0100 +++ kconfig/lex.zconf.c_shipped 2011-01-07 18:36:21.350427520 +0100 @@ -393,12 +393,12 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, 16, 16, 17, 16, 16, 16, 16, 16, 16, - 16, 16, 16, 18, 16, 16, 16 + 16, 18, 16, 16, 16, 16, 16 }, { 11, 16, 16, 17, 16, 16, 16, 16, 16, 16, - 16, 16, 16, 18, 16, 16, 16 + 16, 18, 16, 16, 16, 16, 16 }, @@ -424,13 +424,13 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, 26, 26, 27, 28, 29, 30, 31, 29, 32, - 33, 34, 35, 35, 36, 37, 38 + 33, 34, 35, 34, 36, 37, 38 }, { 11, 26, 26, 27, 28, 29, 30, 31, 29, 32, - 33, 34, 35, 35, 36, 37, 38 + 33, 34, 35, 34, 36, 37, 38 }, { @@ -471,7 +471,7 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, -18, -18, -18, -18, -18, -18, -18, -18, -18, - -18, -18, -18, 44, -18, -18, -18 + -18, 44, -18, -18, -18, -18, -18 }, { @@ -554,13 +554,13 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, -34, -34, -34, -34, -34, -34, -34, -34, -34, - -34, 56, 57, 57, -34, -34, -34 + -34, 56, 56, 56, -34, -34, -34 }, { 11, -35, -35, -35, -35, -35, -35, -35, -35, -35, - -35, 57, 57, 57, -35, -35, -35 + -35, 56, 57, 56, -35, -35, -35 }, { @@ -606,7 +606,7 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, -44, -44, -44, -44, -44, -44, -44, -44, -44, - -44, -44, -44, 44, -44, -44, -44 + -44, 44, -44, -44, -44, -44, -44 }, @@ -669,12 +669,12 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, -56, -56, -56, -56, -56, -56, -56, -56, -56, - -56, 60, 57, 57, -56, -56, -56 + -56, 56, 56, 56, -56, -56, -56 }, { 11, -57, -57, -57, -57, -57, -57, -57, -57, -57, - -57, 57, 57, 57, -57, -57, -57 + -57, 56, 60, 56, -57, -57, -57 }, { @@ -690,7 +690,7 @@ static yyconst flex_int16_t yy_nxt[][17] { 11, -60, -60, -60, -60, -60, -60, -60, -60, -60, - -60, 57, 57, 57, -60, -60, -60 + -60, 56, 56, 56, -60, -60, -60 }, } ; @@ -735,16 +735,16 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, 5, 6, 1, 1, 7, 8, 9, - 10, 1, 1, 1, 11, 12, 12, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 1, 1, 1, - 14, 1, 1, 1, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 1, 15, 1, 1, 13, 1, 13, 13, 13, 13, + 10, 1, 11, 1, 12, 13, 13, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 1, 1, 1, + 14, 1, 1, 1, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 1, 15, 1, 1, 11, 1, 11, 11, 11, 11, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 1, 16, 1, 1, 1, 1, 1, 1, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 1, 16, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, diff -rdup kconfig.oorig/Makefile kconfig/Makefile --- kconfig.oorig/Makefile 2011-01-05 20:55:02.928942680 +0100 +++ kconfig/Makefile 2011-01-07 18:36:19.502394788 +0100 @@ -5,6 +5,12 @@ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \ localmodconfig localyesconfig +HOSTCC ?= gcc +obj ?= . +srctree ?= . +src ?= . +CONFIG_SHELL ?= /bin/sh + ifdef KBUILD_KCONFIG Kconfig := $(KBUILD_KCONFIG) else @@ -226,7 +232,13 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflag HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) HOSTLOADLIBES_nconf = -lmenuw -lpanelw -lncursesw -$(obj)/qconf.o: $(obj)/.tmp_qtcheck +#$(obj)/qconf.o: $(obj)/.tmp_qtcheck + +%.o: %.c + $(HOSTCC) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(HOST_EXTRACFLAGS) -c -o $@ $< +mconf: $(mconf-objs) + $(HOSTCC) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(HOST_EXTRACFLAGS) $(HOSTLOADLIBES_$@) $^ -o $@ + ifeq ($(qconf-target),1) $(obj)/.tmp_qtcheck: $(src)/Makefile diff -rdup kconfig.oorig/zconf.l kconfig/zconf.l --- kconfig.oorig/zconf.l 2011-01-05 01:50:19.000000000 +0100 +++ kconfig/zconf.l 2011-01-07 18:23:00.850373580 +0100 @@ -70,7 +70,7 @@ static void alloc_string(const char *str %} ws [ \n\t] -n [A-Za-z0-9_] +n [A-Za-z0-9_+] %% int str = 0;