diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-05-21 09:42:33 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-05-21 09:42:33 +0000 |
| commit | 9288835a40296ca76645430d2bf14fbf43897a5a (patch) | |
| tree | 72751dbbfda8619d3393d088c44653de0d5ee79a /tools/mkimage/patches/040-include_order.patch | |
| parent | c8b254e5ff25207026c5ba94b2e8fddf0e2db9d4 (diff) | |
| download | master-187ad058-9288835a40296ca76645430d2bf14fbf43897a5a.tar.gz master-187ad058-9288835a40296ca76645430d2bf14fbf43897a5a.tar.bz2 master-187ad058-9288835a40296ca76645430d2bf14fbf43897a5a.zip | |
[tools] mkimage: update to 2014.04
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40807 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mkimage/patches/040-include_order.patch')
| -rw-r--r-- | tools/mkimage/patches/040-include_order.patch | 17 |
1 files changed, 7 insertions, 10 deletions
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) \ |