kconfig: Refresh patches
Signed-off-by: Petr Vorel <petr.vorel@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
a3366b2705
commit
0d61e067eb
@ -48,7 +48,7 @@ Index: kconfig/zconf.tab.c_shipped
|
||||
===================================================================
|
||||
--- kconfig.orig/zconf.tab.c_shipped
|
||||
+++ kconfig/zconf.tab.c_shipped
|
||||
@@ -1515,7 +1515,7 @@
|
||||
@@ -1515,7 +1515,7 @@ yyreduce:
|
||||
* later regardless of whether it comes from the 'prompt' in
|
||||
* mainmenu_stmt or here
|
||||
*/
|
||||
|
@ -2,7 +2,7 @@ Index: kconfig/Makefile
|
||||
===================================================================
|
||||
--- kconfig.orig/Makefile
|
||||
+++ kconfig/Makefile
|
||||
@@ -211,7 +211,35 @@ qconf-cxxobjs := qconf.o
|
||||
@@ -205,7 +205,35 @@ qconf-cxxobjs := qconf.o
|
||||
qconf-objs := zconf.tab.o
|
||||
gconf-objs := gconf.o zconf.tab.o
|
||||
|
||||
@ -39,7 +39,7 @@ Index: kconfig/Makefile
|
||||
|
||||
targets += zconf.lex.c
|
||||
clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck
|
||||
@@ -243,7 +243,7 @@ HOSTLOADLIBES_nconf = $(shell \
|
||||
@@ -243,7 +271,7 @@ HOSTLOADLIBES_nconf = $(shell \
|
||||
|| echo "-lmenu -lpanel -lncurses" )
|
||||
$(obj)/qconf.o: $(obj)/.tmp_qtcheck
|
||||
|
||||
@ -48,7 +48,7 @@ Index: kconfig/Makefile
|
||||
$(obj)/.tmp_qtcheck: $(src)/Makefile
|
||||
-include $(obj)/.tmp_qtcheck
|
||||
|
||||
@@ -270,9 +276,8 @@
|
||||
@@ -270,9 +298,8 @@ $(obj)/.tmp_qtcheck:
|
||||
echo "KC_QT_MOC=$$moc" >> $@
|
||||
endif
|
||||
|
||||
@ -59,7 +59,7 @@ Index: kconfig/Makefile
|
||||
-include $(obj)/.tmp_gtkcheck
|
||||
|
||||
# GTK+ needs some extra effort, too...
|
||||
@@ -300,11 +305,8 @@
|
||||
@@ -300,11 +327,8 @@ $(obj)/zconf.tab.o: $(obj)/zconf.lex.c
|
||||
|
||||
$(obj)/qconf.o: $(obj)/qconf.moc
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user