File l4env-gcc-include.patch of Package l4env

Index: mk/Makeconf
===================================================================
--- mk/Makeconf.orig	
+++ mk/Makeconf
@@ -288,10 +288,11 @@
 GCCDIR_f	= $(shell LC_ALL=C $(CC) -print-search-dirs|sed -ne 's+^install: \(.*[^/][^/]*\)/+\1+p' )
 GCCLIB_f	= $(shell $(CC) -print-libgcc-file-name)
 GCCLIB_EH_f	= $(filter /%,$(shell $(CC) -print-file-name=libgcc_eh.a))
-GCCINCDIR_f	= $(call GCCDIR_f)/include
+GCCINCDIR_f	= $(addprefix $(call GCCDIR_f),/include /include-fixed)
 GCCNOSTACKPROTOPT_f= $(call checkcc,-fno-stack-protector)
 
-GCCINCDIR	= $(GCCDIR)/include
+GCCINCDIR	= $(GCCDIR)/include $(GCCDIR)/include-fixed
+I_GCCINCDIR	= $(addprefix -I,$(GCCINCDIR))
 
 ifneq ($(PKGDIR),)
   ifeq ($(origin PKGNAME),undefined)
--- mk/modes.inc.orig
+++ mk/modes.inc
@@ -38,7 +38,7 @@
                     -I$(OBJ_BASE)/include/uclibc++            \
                     -I$(DROPS_STDDIR)/include/dietlibc        \
                     -I$(DROPS_STDDIR)/include/uclibc++        \
-                    -I$(GCCINCDIR)
+                    $(I_GCCINCDIR)
 LIBC_LIB_diet     = -ldiet_c
 LIBC_INCLUDE_uc   = -nostdinc                                 \
                     -I$(OBJ_BASE)/include/$(ARCH)/uclibc      \
@@ -47,7 +47,7 @@
                     -I$(DROPS_STDDIR)/include/$(ARCH)/uclibc  \
                     -I$(DROPS_STDDIR)/include/uclibc          \
                     -I$(DROPS_STDDIR)/include/uclibc++        \
-                    -I$(GCCINCDIR)
+                    $(I_GCCINCDIR)
 LIBC_LIB_uc       = -luc_c
 
 ifeq ($(USE_DIETLIBC),y)
@@ -220,7 +220,7 @@
 # x86_l4linux - L4Env functions for L4Linux programs
 #
 BID_SUPPORTED_x86_l4linux       = y
-LIBCINCDIR_x86_l4linux          = -I$(GCCINCDIR)
+LIBCINCDIR_x86_l4linux          = $(I_GCCINCDIR)
 LIBCLIBDIR_x86_l4linux          = -L$(DROPS_STDDIR)/lib
 LIBCLIBS_x86_l4linux            = -ldm_generic -ldm_mem -lnames             \
                                   $(ROOTLIB) -lloaderif -ll4env             \
@@ -236,7 +236,7 @@
 #
 BID_SUPPORTED_x86_l4linux_kern  = y
 LIBCINCDIR_x86_l4linux_kern     = -nostdinc -I$(L4LINUX22_DIR)/include      \
-                                  -D__KERNEL__ -DLINUX_ON_L4 -I$(GCCINCDIR)
+                                  -D__KERNEL__ -DLINUX_ON_L4 $(I_GCCINCDIR)
 LIBCLIBDIR_x86_l4linux_kern     =
 LIBCLIBS_x86_l4linux_kern       =
 CRT0_x86_l4linux_kern           =
@@ -744,7 +744,7 @@
 # arm_l4linux - L4Env functions for L4Linux programs
 #
 BID_SUPPORTED_arm_l4linux       = y
-LIBCINCDIR_arm_l4linux          = -I$(GCCINCDIR)
+LIBCINCDIR_arm_l4linux          = $(I_GCCINCDIR)
 LIBCLIBDIR_arm_l4linux          = -L$(DROPS_STDDIR)/lib
 LIBCLIBS_arm_l4linux            = -ldm_generic -ldm_mem -lnames             \
                                   $(ROOTLIB) -lloaderif -ll4env             \
--- pkg/ore/server/src/Makefile.orig
+++ pkg/ore/server/src/Makefile
@@ -58,7 +58,7 @@
 			   -lferret_comm -lferret_fpages -lferret_local_names
 endif
 
-LIBCINCDIR     += -nostdinc -I$(GCCINCDIR)
+LIBCINCDIR     += -nostdinc $(I_GCCINCDIR)
 
 LIBS		+= -levents -lomega0 -lio -ll4rm -lore_server-worker \
 		   -lore_server -lore_notify -llist_alloc -lparsecmdline
--- pkg/dde/linux26/examples/ne2k/Makefile.orig
+++ pkg/dde/linux26/examples/ne2k/Makefile
@@ -18,7 +18,7 @@
 PRIVATE_INCDIR 	= $(PKGDIR_ABS)/linux26/include $(MY_DDE_INCDIR) $(MY_LINUX26_INCDIR)  \
 				  $(OBJ_BASE)/include/uclibc

-LIBCINCDIR  = -nostdinc -I$(GCCINCDIR)
+LIBCINCDIR  = -nostdinc $(I_GCCINCDIR)
 DEFINES     = -D__KERNEL__ -DDDE_LINUX\
 			  $(KBUILD_DEFINES)
 CPPFLAGS 	+= $(KBUILD_CPPFLAGS)
--- ./pkg/dde_linux/lib/src/Makefile.orig
+++ ./pkg/dde_linux/lib/src/Makefile
@@ -13,7 +13,7 @@
         pci.c irq.c softirq.c time.c res.c irq_stat.c bug.c ctor.c
 
 PRIVATE_INCDIR = $(PKGDIR_ABS)/lib/include $(DDE_INCDIR) $(LINUX24_INCDIR)
-LIBCINCDIR  = -nostdinc -I$(GCCINCDIR)
+LIBCINCDIR  = -nostdinc $(I_GCCINCDIR)
 
 DEFINES     = -D__KERNEL__ -DDDE_LINUX
 WARNINGS    = -Wall -Wstrict-prototypes -fno-strict-aliasing
--- ./pkg/dde_linux/lib/sound/Makefile.orig
+++ ./pkg/dde_linux/lib/sound/Makefile
@@ -7,7 +7,7 @@
 ### specialties
 SRC_C       = soundcore.c helpers.c dummy.c
 PRIVATE_INCDIR = $(PKGDIR)/lib/include $(DDE_INCDIR) $(LINUX24_INCDIR)
-LIBCINCDIR  = -nostdinc -I$(GCCINCDIR)
+LIBCINCDIR  = -nostdinc $(I_GCCINCDIR)
 
 DEFINES     = -D__KERNEL__ -DDDE_LINUX
 WARNINGS    = -Wall -Wstrict-prototypes -fno-strict-aliasing
--- ./pkg/dde_linux/examples/debug/Makefile.orig
+++ ./pkg/dde_linux/examples/debug/Makefile
@@ -9,7 +9,7 @@
 
 ### specialties
 PRIVATE_INCDIR = $(DDE_INCDIR) $(LINUX24_INCDIR)
-LIBCINCDIR  = -nostdinc -I$(GCCINCDIR)
+LIBCINCDIR  = -nostdinc $(I_GCCINCDIR)
 
 LIBS        = -ldde_linux -lio -lomega0 -llist_alloc
 
--- ./pkg/dde_linux/examples/sound/Makefile.orig
+++ ./pkg/dde_linux/examples/sound/Makefile
@@ -16,7 +16,7 @@
 ### specialties
 PRIVATE_INCDIR = $(DDE_INCDIR) \
                  $(PKGDIR)/examples/sound/contrib $(LINUX24_INCDIR)
-LIBCINCDIR  = -nostdinc -I$(GCCINCDIR)
+LIBCINCDIR  = -nostdinc $(I_GCCINCDIR)
 
 LIBS = -ldde_linux -ldde_linux-sound -lio -lomega0 -llist_alloc
 
--- ./pkg/dde_linux26/lib/src/Makefile.orig
+++ ./pkg/dde_linux26/lib/src/Makefile
@@ -16,7 +16,7 @@
          pci.c irq.c res.c softirq.c time.c ctype.c ctor.c string.c
 
 PRIVATE_INCDIR = $(PKGDIR_ABS)/lib/include $(DDE26_INCDIR) $(LINUX26_INCDIR)
-LIBCINCDIR = -nostdinc -I$(GCCINCDIR)
+LIBCINCDIR = -nostdinc $(I_GCCINCDIR)
 
 DEFINES  = -D__KERNEL__ -DDDE_LINUX
 WARNINGS = -Wall -Wstrict-prototypes