[PATCH] clutter-1.6: make build for armv4t

[PATCH] clutter-1.6: make build for armv4t

[Wolfgang Denk]

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'".

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 .../recipes-graphics/clutter/clutter-1.6_1.6.14.bb |    6 ++++--
 .../clutter/clutter/fix_build_for_armv4t.patch     |   11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter/fix_build_for_armv4t.patch

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 555133f..0aacf0f 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 @@
 require recipes-graphics/clutter/clutter.inc
 
-PR = "r2"
+PR = "r3"
 
 # Internal json-glib was removed in Clutter 1.5.2
 STDDEPENDS += "json-glib"
@@ -10,7 +10,9 @@ FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
 
 SRC_URI = "http://source.clutter-project.org/sources/clutter/1.6/clutter-${PV}.tar.bz2 \
            file://enable_tests-1.4.patch \
-           file://update_gettext_macro_version.patch"
+           file://update_gettext_macro_version.patch \
+	   file://fix_build_for_armv4t.patch \
+	   "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 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 0000000..28cbfa2
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter/fix_build_for_armv4t.patch
@@ -0,0 +1,11 @@
+--- clutter-1.6.14/clutter/cogl/cogl/cogl-fixed.c.ORIG	2011-03-22 15:46:17.000000000 +0100
++++ clutter-1.6.14/clutter/cogl/cogl/cogl-fixed.c	2011-12-22 09:26:10.650427310 +0100
+@@ -626,7 +626,7 @@
+ 	/*
+ 	 * Find the highest bit set
+ 	 */
+-#if __arm__
++#if __arm__ && !defined(__ARM_ARCH_4T__)
+ 	/* This actually requires at least arm v5, but gcc does not seem
+ 	 * to set the architecture defines correctly, and it is I think
+ 	 * very unlikely that anyone will want to use clutter on anything
-- 
1.7.6.4

Re: [PATCH] clutter-1.6: make build for armv4t

[McClintock Matthew-B29882]

On Thu, Dec 22, 2011 at 3:21 AM, Wolfgang Denk <wd@denx.de> wrote:
> 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'".
>
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  .../recipes-graphics/clutter/clutter-1.6_1.6.14.bb |    6 ++++--

This version was dropped recently... Is this possibly for the 1.1.1
edison release? If so, I would CC: Joshua Lock.

-M

Re: [PATCH] clutter-1.6: make build for armv4t

[Wolfgang Denk]

Dear Matthew,

In message <CAEsOVNc9jV5rO3YiLgL19Q-VeYQ-H-E5sy-huvfYXU3pMAVZHA@mail.gmail.com> you wrote:
> On Thu, Dec 22, 2011 at 3:21 AM, Wolfgang Denk <wd@denx.de> wrote:
> > GCC will define __ARM_ARCH_4T__ when building with "-march=3Darmv4t" 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'".
...
> This version was dropped recently... Is this possibly for the 1.1.1
> edison release? If so, I would CC: Joshua Lock.

yes, this patch was for the edison series (mainline has updated to
clutter-1.8 in the meantime).

Sorry for not being clear.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
"'Tis true, 'tis pity, and pity 'tis 'tis true."
    - Poloniouius, in Willie the Shake's _Hamlet, Prince of Darkness_

Re: [PATCH] clutter-1.6: make build for armv4t

[Joshua Lock]

On 28/12/11 11:46, Wolfgang Denk wrote:
> Dear Matthew,
>
> In message<CAEsOVNc9jV5rO3YiLgL19Q-VeYQ-H-E5sy-huvfYXU3pMAVZHA@mail.gmail.com>  you wrote:
>> On Thu, Dec 22, 2011 at 3:21 AM, Wolfgang Denk<wd@denx.de>  wrote:
>>> GCC will define __ARM_ARCH_4T__ when building with "-march=3Darmv4t" 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'".
> ...
>> This version was dropped recently... Is this possibly for the 1.1.1
>> edison release? If so, I would CC: Joshua Lock.
>
> yes, this patch was for the edison series (mainline has updated to
> clutter-1.8 in the meantime).

Wolfgang, I've pulled this patch into my edison branch. Unless you 
object I'll also apply the patch for cogl in master and send it upstream.

Thanks,
Joshua
-- 
Joshua Lock
         Yocto Project "Johannes factotum"
         Intel Open Source Technology Centre