summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2012-01-03 17:31:20 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-04 11:56:42 +0000
commit00f0d4ad649313e1a9ad2413d942cea78aa56348 (patch)
tree10545f2aaa95bb6c6eed90b86d87ee65b084c7fe /meta/recipes-graphics
parent87babb7894dff7e17a021d688af7ac898e3f48f4 (diff)
downloadpoky-00f0d4ad649313e1a9ad2413d942cea78aa56348.tar.gz
cogl: ensure we can build on armv4
Without this patch cogl will not build for armv4 as it uses an unsupported instruction. This changeset adds a patch from Wolfgang Denk to add an extra guard around armv5 or above code. (From OE-Core rev: e19586765af518892ed55d9bfd45d0857566ae98) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch23
-rw-r--r--meta/recipes-graphics/clutter/cogl_1.8.2.bb5
-rw-r--r--meta/recipes-graphics/clutter/cogl_git.bb5
3 files changed, 30 insertions, 3 deletions
diff --git a/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch b/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
new file mode 100644
index 0000000000..36350854ee
--- /dev/null
+++ b/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
@@ -0,0 +1,23 @@
1GCC will define __ARM_ARCH_4T__ when building with "-march=armv4t" so we can
2check this to turn off the use of 'clz' instructions, which otherwise would
3cause compile errors like "selected processor does not support ARM mode
4`clz r3,r0'".
5
6Upstream-Status: Submitted
7
8Signed-off-by: Wolfgang Denk <wd@denx.de>
9Signed-off-by: Joshua Lock <josh@linux.intel.com>
10
11Index: cogl-1.8.2/cogl/cogl-fixed.c
12===================================================================
13--- cogl-1.8.2.orig/cogl/cogl-fixed.c
14+++ cogl-1.8.2/cogl/cogl-fixed.c
15@@ -626,7 +626,7 @@ cogl_fixed_sqrt (CoglFixed x)
16 /*
17 * Find the highest bit set
18 */
19-#if defined (__arm__)
20+#if defined (__arm__) && !defined(__ARM_ARCH_4T__)
21 /* This actually requires at least arm v5, but gcc does not seem
22 * to set the architecture defines correctly, and it is I think
23 * very unlikely that anyone will want to use clutter on anything
diff --git a/meta/recipes-graphics/clutter/cogl_1.8.2.bb b/meta/recipes-graphics/clutter/cogl_1.8.2.bb
index d99c443b5f..25875f344a 100644
--- a/meta/recipes-graphics/clutter/cogl_1.8.2.bb
+++ b/meta/recipes-graphics/clutter/cogl_1.8.2.bb
@@ -1,9 +1,12 @@
1require cogl.inc 1require cogl.inc
2 2
3PR = "r1"
4
3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 5LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
4 6
5SRC_URI = "http://source.clutter-project.org/sources/cogl/1.8/${BPN}-${PV}.tar.bz2 \ 7SRC_URI = "http://source.clutter-project.org/sources/cogl/1.8/${BPN}-${PV}.tar.bz2 \
6 file://macro-versions.patch" 8 file://macro-versions.patch \
9 file://build_for_armv4t.patch"
7 10
8SRC_URI[md5sum] = "3145cbf7ff162c33065ea4421c047e2f" 11SRC_URI[md5sum] = "3145cbf7ff162c33065ea4421c047e2f"
9SRC_URI[sha256sum] = "8b647b51a4fa93034fcd74ffe86b3d4c919b0e54789108f6d065414e6162ab73" 12SRC_URI[sha256sum] = "8b647b51a4fa93034fcd74ffe86b3d4c919b0e54789108f6d065414e6162ab73"
diff --git a/meta/recipes-graphics/clutter/cogl_git.bb b/meta/recipes-graphics/clutter/cogl_git.bb
index 7a10dd8004..689b965288 100644
--- a/meta/recipes-graphics/clutter/cogl_git.bb
+++ b/meta/recipes-graphics/clutter/cogl_git.bb
@@ -5,11 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
5# the 1.8.2 tag 5# the 1.8.2 tag
6SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5" 6SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
7PV = "1.8.2+git${SRCPV}" 7PV = "1.8.2+git${SRCPV}"
8PR = "r0" 8PR = "r1"
9 9
10DEFAULT_PREFERENCE = "-1" 10DEFAULT_PREFERENCE = "-1"
11 11
12SRC_URI = "git://git.gnome.org/cogl;protocol=git;branch=master" 12SRC_URI = "git://git.gnome.org/cogl;protocol=git;branch=master \
13 file://build_for_armv4t.patch"
13S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
14 15
15AUTOTOOLS_AUXDIR = "${S}/build" 16AUTOTOOLS_AUXDIR = "${S}/build"