aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mkimage/patches/040-include_order.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-11-29 22:43:59 +0000
committerLuka Perkov <luka@openwrt.org>2014-11-29 22:43:59 +0000
commitaa032d78d72b8a9f0f917e6055bfb53d2feefd0c (patch)
tree125055ca04a2b4e8ee602bb5379d013f6923aabf /tools/mkimage/patches/040-include_order.patch
parent15a48a38b8ea48596667ef340a7d263fe74fbaa0 (diff)
downloadmaster-187ad058-aa032d78d72b8a9f0f917e6055bfb53d2feefd0c.tar.gz
master-187ad058-aa032d78d72b8a9f0f917e6055bfb53d2feefd0c.tar.bz2
master-187ad058-aa032d78d72b8a9f0f917e6055bfb53d2feefd0c.zip
[tools] mkimage: update to 2014.10
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43428 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mkimage/patches/040-include_order.patch')
-rw-r--r--tools/mkimage/patches/040-include_order.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/mkimage/patches/040-include_order.patch b/tools/mkimage/patches/040-include_order.patch
index 66f703c855..3b9ecc6bd3 100644
--- a/tools/mkimage/patches/040-include_order.patch
+++ b/tools/mkimage/patches/040-include_order.patch
@@ -1,10 +1,10 @@
--- a/tools/Makefile
+++ b/tools/Makefile
-@@ -193,7 +193,7 @@
+@@ -194,7 +194,7 @@ endif # !LOGO_BMP
# Define _GNU_SOURCE to obtain the getline prototype from stdio.h
#
HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \
-- $(patsubst -I%,-idirafter%, $(UBOOTINCLUDE)) \
+- $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
+ -I$(srctree)/include \
-I$(srctree)/lib/libfdt \
-I$(srctree)/tools \