tools/mkimage: add back a fixed version of 040-include_order.patch to fix build error...

[openwrt-github/.git] / tools / mkimage / patches / 040-include_order.patch

diff --git a/tools/mkimage/patches/040-include_order.patch b/tools/mkimage/patches/040-include_order.patch
index f94e91d700006fb2486196a73eb90bedfc6cb285..94324666f461b130c5ed8c6e1e984e713d5214e0 100644 (file)
--- a/tools/mkimage/patches/040-include_order.patch
+++ b/tools/mkimage/patches/040-include_order.patch
@@ -1,11 +1,11 @@
 --- a/tools/Makefile
 +++ b/tools/Makefile
-@@ -162,9 +162,9 @@
- # Use native tools and options
+@@ -165,9 +165,9 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_
  # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
  #
--HOSTCPPFLAGS =        -idirafter $(SRCTREE)/include \
-+HOSTCPPFLAGS =        -I $(SRCTREE)/include \
+ HOSTCPPFLAGS =        -include $(SRCTREE)/include/libfdt_env.h \
+-              -idirafter $(SRCTREE)/include \
++              -I $(SRCTREE)/include \
                -idirafter $(OBJTREE)/include2 \
 -              -idirafter $(OBJTREE)/include \
 +              -I $(OBJTREE)/include \