aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mkimage/patches/040-include_order.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-05-21 09:42:33 +0000
committerLuka Perkov <luka@openwrt.org>2014-05-21 09:42:33 +0000
commit5342a1a2ea5ce8c7ece7c0f2f4fdf4c4d202f045 (patch)
tree708029231ac804143384629193929cdb0d948f5c /tools/mkimage/patches/040-include_order.patch
parentb10140d8320840695e96a77b9cb1d255b22a602a (diff)
downloadupstream-5342a1a2ea5ce8c7ece7c0f2f4fdf4c4d202f045.tar.gz
upstream-5342a1a2ea5ce8c7ece7c0f2f4fdf4c4d202f045.tar.bz2
upstream-5342a1a2ea5ce8c7ece7c0f2f4fdf4c4d202f045.zip
mkimage: update to 2014.04
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 40807
Diffstat (limited to 'tools/mkimage/patches/040-include_order.patch')
-rw-r--r--tools/mkimage/patches/040-include_order.patch17
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) \