X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2Fmkimage%2Fpatches%2F040-include_order.patch;h=f4fbbaf7578d1db1e3ee4137d3dedb1ea5e5c6cd;hb=5342a1a2ea5ce8c7ece7c0f2f4fdf4c4d202f045;hp=5a9d15eb765442ddd38905efbd5c6165ad2cb743;hpb=dcd3a74da01df1c2660e8fc67762a06746bd52c3;p=openwrt%2F.git

diff --git a/tools/mkimage/patches/040-include_order.patch b/tools/mkimage/patches/040-include_order.patch
index 5a9d15eb76..f4fbbaf757 100644
--- a/tools/mkimage/patches/040-include_order.patch
+++ b/tools/mkimage/patches/040-include_order.patch
@@ -1,14 +1,11 @@
 --- a/tools/Makefile
 +++ b/tools/Makefile
-@@ -159,9 +159,9 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_
- # Use native tools and options
- # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
+@@ -173,7 +173,7 @@
+ # Define _GNU_SOURCE to obtain the getline prototype from stdio.h
  #
--HOSTCPPFLAGS =	-idirafter $(SRCTREE)/include \
-+HOSTCPPFLAGS =	-I $(SRCTREE)/include \
- 		-idirafter $(OBJTREE)/include2 \
--		-idirafter $(OBJTREE)/include \
-+		-I $(OBJTREE)/include \
- 	        -I $(SRCTREE)/lib/libfdt \
- 		-I $(SRCTREE)/tools \
+ HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \
+-		$(patsubst -I%,-idirafter%, $(UBOOTINCLUDE)) \
++		-I$(srctree)/include \
+ 		-I$(srctree)/lib/libfdt \
+ 		-I$(srctree)/tools \
  		-DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \