diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2014-05-06 15:53:12 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-08 12:56:41 +0100 |
| commit | 5477cc86015be24cc5b232ac1f8c67cd8b65a740 (patch) | |
| tree | c4ad7b0fb33c7e3e6f282456dc61eb433c88efa1 /meta/recipes-devtools/mmc | |
| parent | 370d8954dddd90addd0e955bbd4592316af113b8 (diff) | |
| download | openembedded-core-5477cc86015be24cc5b232ac1f8c67cd8b65a740.tar.gz openembedded-core-5477cc86015be24cc5b232ac1f8c67cd8b65a740.tar.bz2 openembedded-core-5477cc86015be24cc5b232ac1f8c67cd8b65a740.zip | |
mmc-utils: fix compilation failure for mips64 target.
This patch fixes mmc-utils compilation failure for qemumips64.
Remove the 'include <asm-generic/int-ll64.h>' line from mmc.h,
because this file is automatically included if _MIPS_SZLONG
is not 64, otherwise, <asm-generic/int-l64.h> is included.
Expicitly including <asm-generic/int-ll64.h> will cause the
compilation failure for mips64 target.
[YOCTO #6267]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/mmc')
| -rw-r--r-- | meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-devtools/mmc/mmc-utils_git.bb | 4 |
2 files changed, 30 insertions, 2 deletions
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 0000000000..1724de5c69 --- /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 <asm-generic/int-ll64.h> + +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 <linux/mmc/ioctl.h> file if _MIPS_SZLONG is not 64. + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + 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 <asm-generic/int-ll64.h> + #include <linux/mmc/ioctl.h> + #include <stdio.h> + +-- +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 abde4b1110..d88520c786 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" |