From 9bf4e656e13d14cfda2f65495453fd87e9cf7790 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 6 May 2014 15:53:12 +0800 Subject: mmc-utils: fix compilation failure for mips64 target. This patch fixes mmc-utils compilation failure for qemumips64. Remove the 'include ' line from mmc.h, because this file is automatically included if _MIPS_SZLONG is not 64, otherwise, is included. Expicitly including will cause the compilation failure for mips64 target. [YOCTO #6267] (From OE-Core rev: 5477cc86015be24cc5b232ac1f8c67cd8b65a740) Signed-off-by: Chen Qi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- ...mc.h-don-t-include-asm-generic-int-ll64.h.patch | 28 ++++++++++++++++++++++ meta/recipes-devtools/mmc/mmc-utils_git.bb | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch b/meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch new file mode 100644 index 0000000..1724de5 --- /dev/null +++ b/meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch @@ -0,0 +1,28 @@ +Upstream-Status: Pending + +mmc.h: don't include + +Including this file causes a compile failure for qemumips64. +This file is not needed to be explicitly included, because it will be +included by the file if _MIPS_SZLONG is not 64. + +Signed-off-by: Chen Qi +--- + mmc.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/mmc.h b/mmc.h +index 9871d62..3df2cdf 100644 +--- a/mmc.h ++++ b/mmc.h +@@ -14,7 +14,6 @@ + * Boston, MA 021110-1307, USA. + */ + +-#include + #include + #include + +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb index abde4b1..d88520c 100644 --- a/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb @@ -8,8 +8,8 @@ SRCREV = "11f2ceabc4ad3f0dd568e0ce68166e4803e0615b" PV = "0.1" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;protocol=git;branch=${BRANCH}" - +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;protocol=git;branch=${BRANCH} \ + file://0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch" S = "${WORKDIR}/git" -- cgit v1.1