BUG: linux-2.6.0-test7: make O=/var/tmp/build xconfig

Hello

Maybe i´m not up-to-date, but i tried out the new 2.6 kernel
with the new O option and it fails with:
I think here´s something wrong, one -I is missing between
the //: -I/usr/src/linux_dir/kernel2.6/linux-2.6.0-test7//usr/lib/qt-2.3.1/include

--------------------8<-------------------8<--------------
[62]:thomas (2) $ make -w V=1 O=/var/tmp/build xconfig
make: Entering directory `/usr/src/linux_dir/kernel2.6/linux-2.6.0-test7'
make -C /var/tmp/build \
KBUILD_SRC=/usr/src/linux_dir/kernel2.6/linux-2.6.0-test7 KBUILD_VERBOSE=1 \
KBUILD_CHECK= -f /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/Makefile xconfig
make -f /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/Makefile.build obj=scripts scripts/fixdep
make[2]: `scripts/fixdep' is up to date.
make -f /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/Makefile.build obj=scripts/kconfig xconfig
--> g++ -Wp,-MD,scripts/kconfig/.qconf.o.d -O2 -I/usr/src/linux_dir/kernel2.6/linux-2.6.0-test7//usr/lib/qt-2.3.1/include -c -o scripts/kconf ig/qconf.o /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:6: qapplication.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:7: qmainwindow.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:8: qtoolbar.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:9: qvbox.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:10: qsplitter.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:11: qlistview.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:12: qtextview.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:13: qlineedit.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:14: qmenubar.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:15: qmessagebox.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:16: qaction.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:17: qheader.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:18: qfiledialog.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:19: qregexp.h: No such file or directory
In file included from /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:26:
/usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/lkc.h:18: lkc_defs.h: No such file or directory
In file included from /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:27:
/usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.h:6: qlistview.h: No such file or directory /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/scripts/kconfig/qconf.cc:29: qconf.moc: No such file or directory make[2]: *** [scripts/kconfig/qconf.o] Error 1
make[1]: *** [xconfig] Error 2
make: *** [xconfig] Error 2
make: Leaving directory `/usr/src/linux_dir/kernel2.6/linux-2.6.0-test7'

---
Tom

Hi Thomas - the following patch fixes this and also avoid duplicating some options on the gcc command line.

Sam

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1296.61.1 -> 1.1296.61.2
# scripts/Makefile.lib 1.22 -> 1.23
# Makefile 1.435 -> 1.436
#
# The following is the BitKeeper ChangeSet Log
# 03/10/12 [email protected] 1.1296.61.2
# kbuild: Fix make O=../build xconfig
#
# Compilation of qconf required -I path to qt. kbuild invalidated the

# path to qt by prefixing it with $(srctree). No longer prefix absolute paths.
# Also do not duplicate CPPFLAGS. Previously it was appended twice to CFLAGS
# --------------------------------------------
#
diff -Nru a/Makefile b/Makefile
--- a/Makefile	Sat Oct 18 09:48:02 2003
+++ b/Makefile	Sat Oct 18 09:48:02 2003
@@ -404,10 +404,6 @@

include $(srctree)/arch/$(ARCH)/Makefile

-# Let architecture Makefiles change CPPFLAGS if needed -CFLAGS := $(CPPFLAGS) $(CFLAGS)
-AFLAGS := $(CPPFLAGS) $(AFLAGS)
-
core-y += kernel/ mm/ fs/ ipc/ security/ crypto/

SUBDIRS += $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \

diff -Nru a/scripts/Makefile.lib b/scripts/Makefile.lib
@@ -154,7 +154,8 @@
 __hostcxx_flags	= $(_hostcxx_flags)
 else
 flags = $(foreach o,$($(1)),\
-	$(if $(filter -I%,$(o)),$(patsubst -I%,-I$(srctree)/%,$(o)),$(o)))
+		$(if $(filter -I%,$(filter-out -I/%,$(o))), \
+		$(patsubst -I%,-I$(srctree)/%,$(o)),$(o)))
 
 # -I$(obj) locate generated .h files
 # -I$(srctree)/$(src) locate .h files in srctree, from generated .c files

@@ -162,7 +163,7 @@
 __c_flags	= -I$(obj) -I$(srctree)/$(src) $(call flags,_c_flags)
 __a_flags	=                              $(call flags,_a_flags)
 __hostc_flags	= -I$(obj)                     $(call flags,_hostc_flags)
-__hostcxx_flags	=                              $(call flags,_hostcxx_flags)
+__hostcxx_flags	= -I$(obj)                     $(call flags,_hostcxx_flags)
 endif
 
 c_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \