diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-09-10 05:32:59 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-23 09:53:02 +0100 |
commit | 5aadabf9ee8ce2e0f283985ae9fc7bf53ce427b8 (patch) | |
tree | 6eaffa24bf1f5dc0cf07bf11f270ab7723f564f7 /meta/recipes-devtools/syslinux | |
parent | 05b9a0c6281bf9d356ec836acb003ac80b9726a3 (diff) | |
download | poky-5aadabf9ee8ce2e0f283985ae9fc7bf53ce427b8.tar.gz |
syslinux: Dont bypass gcc driver for dependency generation options
GCC docs also do not recommend using -Wp instead pass the option via gcc
driver and let it process it as needed
This also helps in making it work with clang as well
(From OE-Core rev: f3ac32e0bc83d7aeea3e84258c258c2bb6dab44e)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/syslinux')
-rw-r--r-- | meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch | 33 | ||||
-rw-r--r-- | meta/recipes-devtools/syslinux/syslinux_6.03.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch b/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch new file mode 100644 index 0000000000..443c1ccc58 --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 0f3d83c25491951f1fa84c7957358ef3d1bcd8a9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 9 Sep 2015 17:39:22 +0000 | ||
4 | Subject: [PATCH] mk: -MMD does not take any arguments | ||
5 | |||
6 | Specify -Wp for each option, clang seems to not accept | ||
7 | -Wp,-x,y,-a,b | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | Upstream-Status: Pending | ||
12 | |||
13 | mk/syslinux.mk | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | Index: syslinux-6.03/mk/syslinux.mk | ||
17 | =================================================================== | ||
18 | --- syslinux-6.03.orig/mk/syslinux.mk | ||
19 | +++ syslinux-6.03/mk/syslinux.mk | ||
20 | @@ -82,11 +82,11 @@ ARCH ?= $(strip $(SUBARCH)) | ||
21 | GCCWARN = -W -Wall -Wstrict-prototypes $(DEBUGOPT) | ||
22 | |||
23 | # Common stanza to make gcc generate .*.d dependency files | ||
24 | -MAKEDEPS = -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d | ||
25 | +MAKEDEPS = -MT $@ -MD | ||
26 | |||
27 | # Dependencies that exclude system headers; use whenever we use | ||
28 | # header files from the platform. | ||
29 | -UMAKEDEPS = -Wp,-MT,$@,-MMD,$(dir $@).$(notdir $@).d | ||
30 | +UMAKEDEPS = -MT $@ -MMD | ||
31 | |||
32 | # Items that are only appropriate during development; this file is | ||
33 | # removed when tarballs are generated. | ||
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb index 94077da25d..8534528d7e 100644 --- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb +++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb | |||
@@ -22,6 +22,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/syslinux-${PV}.tar.xz \ | |||
22 | file://0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch \ | 22 | file://0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch \ |
23 | file://0009-linux-syslinux-implement-install_bootblock.patch \ | 23 | file://0009-linux-syslinux-implement-install_bootblock.patch \ |
24 | file://0010-gcc46-compatibility.patch \ | 24 | file://0010-gcc46-compatibility.patch \ |
25 | file://0011-mk-MMD-does-not-take-any-arguments.patch \ | ||
25 | " | 26 | " |
26 | 27 | ||
27 | SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13" | 28 | SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13" |