Patchwork [2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops

login
register
mail settings
Submitter Henning Heinold
Date March 22, 2011, 8:01 a.m.
Message ID <1300780910-28866-3-git-send-email-heinold@inf.fu-berlin.de>
Download mbox | patch
Permalink /patch/1667/
State New, archived
Headers show

Comments

Henning Heinold - March 22, 2011, 8:01 a.m.
From: Henning Heinold <heinold@inf.fu-berlin.de>


Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
---
 recipes/cairo/cairo.inc |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
Paul Menzel - March 22, 2011, 8:31 a.m.
Am Dienstag, den 22.03.2011, 09:01 +0100 schrieb heinold@inf.fu-berlin.de:
> From: Henning Heinold <heinold@inf.fu-berlin.de>

Maybe add a link to the corresponding discussion [1].

[1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-March/031058.html

> Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
> ---
>  recipes/cairo/cairo.inc |    9 ++++++++-
>  1 files changed, 8 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/cairo/cairo.inc b/recipes/cairo/cairo.inc
> index c60d7d9..fad50b3 100644
> --- a/recipes/cairo/cairo.inc
> +++ b/recipes/cairo/cairo.inc
> @@ -1,15 +1,22 @@
>  SECTION = "libs"
>  PRIORITY = "optional"
> -DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
>  DESCRIPTION = "Cairo graphics library"
>  LICENSE = "MPL LGPL"
>  
> +DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
> +
> +DEPENDS_append_arm = " libatomic-ops"
> +DEPENDS_append_mips = " libatomic-ops"
> +DEPENDS_append_mipsel = " libatomic-ops"
> +DEPENDS_append_ppc = " libatomic-ops"
> +
>  #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 
>  require cairo-fpu.inc
>  EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}"
>  
>  inherit autotools pkgconfig 
>  
> +

When you commit, please remove the extra line, which slipped in.

>  PACKAGES =+ "cairo-trace cairo-trace-dev libcairo-script-interpreter libcairo-gobject"
>  FILES_libcairo-gobject = "${libdir}/libcairo-gobject.so.*"
>  FILES_libcairo-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*"

I am ignorant on this topic, so others have to acknowledge your patch.


Sorry and thanks,

Paul
Koen Kooi - March 22, 2011, 9:07 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 22-03-11 09:01, heinold@inf.fu-berlin.de wrote:
> From: Henning Heinold <heinold@inf.fu-berlin.de>
> 
> 
> Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
> ---
>  recipes/cairo/cairo.inc |    9 ++++++++-
>  1 files changed, 8 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/cairo/cairo.inc b/recipes/cairo/cairo.inc
> index c60d7d9..fad50b3 100644
> --- a/recipes/cairo/cairo.inc
> +++ b/recipes/cairo/cairo.inc
> @@ -1,15 +1,22 @@
>  SECTION = "libs"
>  PRIORITY = "optional"
> -DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
>  DESCRIPTION = "Cairo graphics library"
>  LICENSE = "MPL LGPL"
>  
> +DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
> +
> +DEPENDS_append_arm = " libatomic-ops"
> +DEPENDS_append_mips = " libatomic-ops"
> +DEPENDS_append_mipsel = " libatomic-ops"
> +DEPENDS_append_ppc = " libatomic-ops"
> +

what about the 64bit and eb versions of those? And gnuspe?

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNiGa0MkyGM64RGpERAkjBAKCBxAqPrwlM44loiYqNHuDqAGSbcACgmY8x
ZE08FcXVn8I9UsC+hJkWxhY=
=KpPl
-----END PGP SIGNATURE-----
Khem Raj - March 22, 2011, 5:19 p.m.
On (22/03/11 09:01), heinold@inf.fu-berlin.de wrote:
> From: Henning Heinold <heinold@inf.fu-berlin.de>
> 
> 
> Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
> ---
>  recipes/cairo/cairo.inc |    9 ++++++++-
>  1 files changed, 8 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/cairo/cairo.inc b/recipes/cairo/cairo.inc
> index c60d7d9..fad50b3 100644
> --- a/recipes/cairo/cairo.inc
> +++ b/recipes/cairo/cairo.inc
> @@ -1,15 +1,22 @@
>  SECTION = "libs"
>  PRIORITY = "optional"
> -DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
>  DESCRIPTION = "Cairo graphics library"
>  LICENSE = "MPL LGPL"
>  
> +DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
> +
> +DEPENDS_append_arm = " libatomic-ops"
> +DEPENDS_append_mips = " libatomic-ops"
> +DEPENDS_append_mipsel = " libatomic-ops"
> +DEPENDS_append_ppc = " libatomic-ops"
> +

Do we need these deps suppose if one is using gcc 4.5 ?
Henning Heinold - March 22, 2011, 5:30 p.m.
On Tue, Mar 22, 2011 at 10:19:54AM -0700, Khem Raj wrote:
> On (22/03/11 09:01), heinold@inf.fu-berlin.de wrote:
> > From: Henning Heinold <heinold@inf.fu-berlin.de>
> > 
> > 
> > Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
> > ---
> >  recipes/cairo/cairo.inc |    9 ++++++++-
> >  1 files changed, 8 insertions(+), 1 deletions(-)
> > 
> > diff --git a/recipes/cairo/cairo.inc b/recipes/cairo/cairo.inc
> > index c60d7d9..fad50b3 100644
> > --- a/recipes/cairo/cairo.inc
> > +++ b/recipes/cairo/cairo.inc
> > @@ -1,15 +1,22 @@
> >  SECTION = "libs"
> >  PRIORITY = "optional"
> > -DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
> >  DESCRIPTION = "Cairo graphics library"
> >  LICENSE = "MPL LGPL"
> >  
> > +DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
> > +
> > +DEPENDS_append_arm = " libatomic-ops"
> > +DEPENDS_append_mips = " libatomic-ops"
> > +DEPENDS_append_mipsel = " libatomic-ops"
> > +DEPENDS_append_ppc = " libatomic-ops"
> > +

No,

but how do you will filter it? We have no versions dep in bitbake.

Bye Henning
Khem Raj - March 22, 2011, 6:14 p.m.
On (22/03/11 18:30), Henning Heinold wrote:
> On Tue, Mar 22, 2011 at 10:19:54AM -0700, Khem Raj wrote:
> > On (22/03/11 09:01), heinold@inf.fu-berlin.de wrote:
> > > From: Henning Heinold <heinold@inf.fu-berlin.de>
> > > 
> > > 
> > > Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
> > > ---
> > >  recipes/cairo/cairo.inc |    9 ++++++++-
> > >  1 files changed, 8 insertions(+), 1 deletions(-)
> > > 
> > > diff --git a/recipes/cairo/cairo.inc b/recipes/cairo/cairo.inc
> > > index c60d7d9..fad50b3 100644
> > > --- a/recipes/cairo/cairo.inc
> > > +++ b/recipes/cairo/cairo.inc
> > > @@ -1,15 +1,22 @@
> > >  SECTION = "libs"
> > >  PRIORITY = "optional"
> > > -DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
> > >  DESCRIPTION = "Cairo graphics library"
> > >  LICENSE = "MPL LGPL"
> > >  
> > > +DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
> > > +
> > > +DEPENDS_append_arm = " libatomic-ops"
> > > +DEPENDS_append_mips = " libatomic-ops"
> > > +DEPENDS_append_mipsel = " libatomic-ops"
> > > +DEPENDS_append_ppc = " libatomic-ops"
> > > +
> 
> No,
> 
> but how do you will filter it? We have no versions dep in bitbake.

Yes a limitation. If it will still let gcc use its atomics if they
exist then we can live with unused dependency. Can you put a comment
saying that you can ammend the deps if you are using a gcc/arch combo
which supports atomics ?
> 
> Bye Henning
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Phil Blundell - March 23, 2011, 10:21 a.m.
On Tue, 2011-03-22 at 18:30 +0100, Henning Heinold wrote:
> but how do you will filter it? We have no versions dep in bitbake.

You could arrange for gcc-cross 4.5 (and later) to PROVIDE
virtual/atomic-ops or some such.

p.

Patch

diff --git a/recipes/cairo/cairo.inc b/recipes/cairo/cairo.inc
index c60d7d9..fad50b3 100644
--- a/recipes/cairo/cairo.inc
+++ b/recipes/cairo/cairo.inc
@@ -1,15 +1,22 @@ 
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
 
+DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
+
+DEPENDS_append_arm = " libatomic-ops"
+DEPENDS_append_mips = " libatomic-ops"
+DEPENDS_append_mipsel = " libatomic-ops"
+DEPENDS_append_ppc = " libatomic-ops"
+
 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 
 require cairo-fpu.inc
 EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}"
 
 inherit autotools pkgconfig 
 
+
 PACKAGES =+ "cairo-trace cairo-trace-dev libcairo-script-interpreter libcairo-gobject"
 FILES_libcairo-gobject = "${libdir}/libcairo-gobject.so.*"
 FILES_libcairo-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*"