diff options
author | Wolfgang Denk <wd@denx.de> | 2011-12-22 10:21:09 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:43:51 +0000 |
commit | a5c04850e6c6e1cbd07216809093ac94292341af (patch) | |
tree | 99e9a59a9651f77dd76ddc1950f7d7bfbdf183fa | |
parent | cef4500611f5dd400b0b4a53b25c201e3223e40b (diff) | |
download | poky-a5c04850e6c6e1cbd07216809093ac94292341af.tar.gz |
clutter-1.6: make build for armv4t
GCC will define __ARM_ARCH_4T__ when building with "-march=armv4t" so
we can check this to turn off the use of 'clz' instructions, which
otherwise would cause compile errors like "selected processor does
not support ARM mode `clz r3,r0'".
(From OE-Core rev: 6859e3fc34269620146d26eeecc9b93c3a9d7055)
Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb | 6 | ||||
-rw-r--r-- | meta/recipes-graphics/clutter/clutter/fix_build_for_armv4t.patch | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb index 555133f482..0aacf0f4a5 100644 --- a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb +++ b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require recipes-graphics/clutter/clutter.inc | 1 | require recipes-graphics/clutter/clutter.inc |
2 | 2 | ||
3 | PR = "r2" | 3 | PR = "r3" |
4 | 4 | ||
5 | # Internal json-glib was removed in Clutter 1.5.2 | 5 | # Internal json-glib was removed in Clutter 1.5.2 |
6 | STDDEPENDS += "json-glib" | 6 | STDDEPENDS += "json-glib" |
@@ -10,7 +10,9 @@ FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" | |||
10 | 10 | ||
11 | SRC_URI = "http://source.clutter-project.org/sources/clutter/1.6/clutter-${PV}.tar.bz2 \ | 11 | SRC_URI = "http://source.clutter-project.org/sources/clutter/1.6/clutter-${PV}.tar.bz2 \ |
12 | file://enable_tests-1.4.patch \ | 12 | file://enable_tests-1.4.patch \ |
13 | file://update_gettext_macro_version.patch" | 13 | file://update_gettext_macro_version.patch \ |
14 | file://fix_build_for_armv4t.patch \ | ||
15 | " | ||
14 | 16 | ||
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" | 17 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" |
16 | S = "${WORKDIR}/clutter-${PV}" | 18 | S = "${WORKDIR}/clutter-${PV}" |
diff --git a/meta/recipes-graphics/clutter/clutter/fix_build_for_armv4t.patch b/meta/recipes-graphics/clutter/clutter/fix_build_for_armv4t.patch new file mode 100644 index 0000000000..28cbfa28f0 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter/fix_build_for_armv4t.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- clutter-1.6.14/clutter/cogl/cogl/cogl-fixed.c.ORIG 2011-03-22 15:46:17.000000000 +0100 | ||
2 | +++ clutter-1.6.14/clutter/cogl/cogl/cogl-fixed.c 2011-12-22 09:26:10.650427310 +0100 | ||
3 | @@ -626,7 +626,7 @@ | ||
4 | /* | ||
5 | * Find the highest bit set | ||
6 | */ | ||
7 | -#if __arm__ | ||
8 | +#if __arm__ && !defined(__ARM_ARCH_4T__) | ||
9 | /* This actually requires at least arm v5, but gcc does not seem | ||
10 | * to set the architecture defines correctly, and it is I think | ||
11 | * very unlikely that anyone will want to use clutter on anything | ||