From f3ac32e0bc83d7aeea3e84258c258c2bb6dab44e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 10 Sep 2015 05:32:59 +0000 Subject: 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 Signed-off-by: Khem Raj Signed-off-by: Ross Burton --- .../0011-mk-MMD-does-not-take-any-arguments.patch | 33 ++++++++++++++++++++++ meta/recipes-devtools/syslinux/syslinux_6.03.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch (limited to 'meta/recipes-devtools') 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 @@ +From 0f3d83c25491951f1fa84c7957358ef3d1bcd8a9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 9 Sep 2015 17:39:22 +0000 +Subject: [PATCH] mk: -MMD does not take any arguments + +Specify -Wp for each option, clang seems to not accept +-Wp,-x,y,-a,b + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + mk/syslinux.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: syslinux-6.03/mk/syslinux.mk +=================================================================== +--- syslinux-6.03.orig/mk/syslinux.mk ++++ syslinux-6.03/mk/syslinux.mk +@@ -82,11 +82,11 @@ ARCH ?= $(strip $(SUBARCH)) + GCCWARN = -W -Wall -Wstrict-prototypes $(DEBUGOPT) + + # Common stanza to make gcc generate .*.d dependency files +-MAKEDEPS = -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d ++MAKEDEPS = -MT $@ -MD + + # Dependencies that exclude system headers; use whenever we use + # header files from the platform. +-UMAKEDEPS = -Wp,-MT,$@,-MMD,$(dir $@).$(notdir $@).d ++UMAKEDEPS = -MT $@ -MMD + + # Items that are only appropriate during development; this file is + # 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 \ file://0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch \ file://0009-linux-syslinux-implement-install_bootblock.patch \ file://0010-gcc46-compatibility.patch \ + file://0011-mk-MMD-does-not-take-any-arguments.patch \ " SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13" -- cgit 1.2.3-korg