aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-06-18 21:53:46 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-06-18 21:53:46 +0000
commit40f43fbb47f5af09a999bd13716b17899037fe68 (patch)
tree14d208a5017f289acd146ed9faeac84c1fa59bed /tools
parent3ce3b38c70edb9669a1a217033961135f91fa207 (diff)
downloadupstream-40f43fbb47f5af09a999bd13716b17899037fe68.tar.gz
upstream-40f43fbb47f5af09a999bd13716b17899037fe68.tar.bz2
upstream-40f43fbb47f5af09a999bd13716b17899037fe68.zip
tools/mkimage: add back a fixed version of 040-include_order.patch to fix build errors on some systems (#12232)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36967 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
-rw-r--r--tools/mkimage/patches/040-include_order.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/mkimage/patches/040-include_order.patch b/tools/mkimage/patches/040-include_order.patch
new file mode 100644
index 0000000000..94324666f4
--- /dev/null
+++ b/tools/mkimage/patches/040-include_order.patch
@@ -0,0 +1,14 @@
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -165,9 +165,9 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_
+ # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
+ #
+ 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 \
+ -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \