[tools] mkimage: update to 2014.10

[openwrt/svn-archive/archive.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 66f703c85554c0882113569a4d2aee9da24a90ae..3b9ecc6bd3e4889573175ceb83914fb5abb4579b 100644 (file)
--- 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 \