X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Fmkimage%2Fpatches%2F040-include_order.patch;fp=tools%2Fmkimage%2Fpatches%2F040-include_order.patch;h=f4fbbaf7578d1db1e3ee4137d3dedb1ea5e5c6cd;hb=5caf954c9144e9886612c32361cbfdc2102f1ff3;hp=e4dc78ef27427e6b601a5891909079cd784c4524;hpb=6ba36591c7d55c04bbfbec0faefe97b026042bae;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/tools/mkimage/patches/040-include_order.patch b/tools/mkimage/patches/040-include_order.patch
index e4dc78ef27..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
-@@ -160,9 +160,9 @@
- # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
+@@ -173,7 +173,7 @@
+ # Define _GNU_SOURCE to obtain the getline prototype from stdio.h
  #
- HOSTCPPFLAGS =	-include $(SRCTREE)/include/libfdt_env.h \
--		-idirafter $(SRCTREE)/include \
-+		-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) \