* Attempt to fix libatomic-ops
@ 2011-03-22 8:01 heinold
2011-03-22 8:01 ` [PATCH 1/3] libatomic-ops: switch to own directroy and use cvs version heinold
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: heinold @ 2011-03-22 8:01 UTC (permalink / raw)
To: openembedded-devel
Hi,
this 3 patches switches libatomic-op to its own dir,
uses the cvs version and hopefully fixes the cairo
build in cases where gcc is to old. I did not find
the time to test the build with the older gcc. With
gcc-4.5 for arm and ppc arch the gcc mechanism for
atomic-op's are used.
Bye Henning
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 1/3] libatomic-ops: switch to own directroy and use cvs version 2011-03-22 8:01 Attempt to fix libatomic-ops heinold @ 2011-03-22 8:01 ` heinold 2011-03-22 8:19 ` Koen Kooi 2011-03-22 8:01 ` [PATCH 2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops heinold 2011-03-22 8:01 ` [PATCH 3/3] pulseaudio.inc: " heinold 2 siblings, 1 reply; 14+ messages in thread From: heinold @ 2011-03-22 8:01 UTC (permalink / raw) To: openembedded-devel From: Henning Heinold <heinold@inf.fu-berlin.de> * may fix build issuses seen with cairo * fix recipe name Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de> --- recipes/libatomic-ops/libatomic-ops_cvs.bb | 15 +++ .../libatomics-ops/dont.install.header.twice.patch | 19 --- .../fedora/libatomic_ops-1.2-ppclwzfix.patch | 15 --- .../gentoo/libatomic_ops-1.2-mips.patch | 121 -------------------- recipes/pulseaudio/libatomics-ops_1.2.bb | 23 ---- 5 files changed, 15 insertions(+), 178 deletions(-) create mode 100644 recipes/libatomic-ops/libatomic-ops_cvs.bb delete mode 100644 recipes/pulseaudio/libatomics-ops/dont.install.header.twice.patch delete mode 100644 recipes/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch delete mode 100644 recipes/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch delete mode 100644 recipes/pulseaudio/libatomics-ops_1.2.bb diff --git a/recipes/libatomic-ops/libatomic-ops_cvs.bb b/recipes/libatomic-ops/libatomic-ops_cvs.bb new file mode 100644 index 0000000..26f64b8 --- /dev/null +++ b/recipes/libatomic-ops/libatomic-ops_cvs.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A library for atomic integer operations" +LICENSE = "MIT" + +PV = "4.0+cvs${SRCDATE}" + +SRC_URI = "cvs://anonymous@bdwgc.cvs.sourceforge.net/cvsroot/bdwgc;module=bdwgc" + +S = "${WORKDIR}/bdwgc/libatomic_ops/" + +inherit autotools pkgconfig + +# Allow empty package to fix SDK depchains +ALLOW_EMPTY_${PN} = "1" + +FILES_${PN}-doc += "${datadir}/libatomic_ops/COPYING ${datadir}/libatomic_ops/*.txt" diff --git a/recipes/pulseaudio/libatomics-ops/dont.install.header.twice.patch b/recipes/pulseaudio/libatomics-ops/dont.install.header.twice.patch deleted file mode 100644 index 5884810..0000000 --- a/recipes/pulseaudio/libatomics-ops/dont.install.header.twice.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -uNr libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am libatomic_ops-1.2.new/src/atomic_ops/sysdeps/Makefile.am ---- libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am 2010-03-26 09:30:32.000000000 +0100 -+++ libatomic_ops-1.2.new/src/atomic_ops/sysdeps/Makefile.am 2010-03-26 09:34:13.000000000 +0100 -@@ -25,7 +25,6 @@ - README \ - \ - gcc/alpha.h gcc/arm.h gcc/x86.h \ -- gcc/hppa.h gcc/ia64.h \ - gcc/powerpc.h gcc/sparc.h \ - gcc/hppa.h gcc/m68k.h gcc/s390.h \ - gcc/ia64.h gcc/x86_64.h gcc/cris.h \ -diff -uNr libatomic_ops-1.2/doc/Makefile.am libatomic_ops-1.2.new/doc/Makefile.am ---- libatomic_ops-1.2/doc/Makefile.am 2005-03-21 23:05:19.000000000 +0100 -+++ libatomic_ops-1.2.new/doc/Makefile.am 2010-03-26 09:38:18.000000000 +0100 -@@ -1,3 +1,3 @@ - # installed documentation - # --dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt -+dist_pkgdata_DATA=COPYING LICENSING.txt README.txt README_stack.txt README_malloc.txt README_win32.txt diff --git a/recipes/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch b/recipes/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch deleted file mode 100644 index 51161db..0000000 --- a/recipes/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://cvs.fedoraproject.org/viewcvs/devel/libatomic_ops/libatomic_ops-1.2-ppclwzfix.patch - -* add fix for bad variable handling on PPC - ---- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/gcc/powerpc.h 2007-05-29 19:29:52.000000000 +0200 -+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/powerpc.h 2007-05-29 19:30:48.000000000 +0200 -@@ -72,7 +72,7 @@ - /* registers. I always got "impossible constraint" when I */ - /* tried the "y" constraint. */ - __asm__ __volatile__ ( -- "lwz %0,%1\n" -+ "lwz%U1%X1 %0,%1\n" - "cmpw cr7,%0,%0\n" - "bne- cr7,1f\n" - "1: isync\n" diff --git a/recipes/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch b/recipes/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch deleted file mode 100644 index 79188ce..0000000 --- a/recipes/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff --git a/src/atomic_ops.h b/src/atomic_ops.h -index c23f30b..791b360 100755 ---- a/src/atomic_ops.h -+++ b/src/atomic_ops.h -@@ -220,6 +220,9 @@ - # if defined(__cris__) || defined(CRIS) - # include "atomic_ops/sysdeps/gcc/cris.h" - # endif -+# if defined(__mips__) -+# include "atomic_ops/sysdeps/gcc/mips.h" -+# endif - #endif /* __GNUC__ && !AO_USE_PTHREAD_DEFS */ - - #if defined(__INTEL_COMPILER) && !defined(AO_USE_PTHREAD_DEFS) -diff --git a/src/atomic_ops/sysdeps/Makefile.am b/src/atomic_ops/sysdeps/Makefile.am -index 74122b4..d6737c0 100644 ---- a/src/atomic_ops/sysdeps/Makefile.am -+++ b/src/atomic_ops/sysdeps/Makefile.am -@@ -29,6 +29,7 @@ nobase_sysdep_HEADERS= generic_pthread.h \ - gcc/powerpc.h gcc/sparc.h \ - gcc/hppa.h gcc/m68k.h gcc/s390.h \ - gcc/ia64.h gcc/x86_64.h gcc/cris.h \ -+ gcc/mips.h \ - \ - icc/ia64.h \ - \ -diff --git a/src/atomic_ops/sysdeps/gcc/mips.h b/src/atomic_ops/sysdeps/gcc/mips.h -new file mode 100644 -index 0000000..e7f3a5d ---- /dev/null -+++ b/src/atomic_ops/sysdeps/gcc/mips.h -@@ -0,0 +1,89 @@ -+/* -+ * Copyright (c) 2005 Thiemo Seufer <ths@networkno.de> -+ * Copyright (c) 2007 Zhang Le <r0bertz@gentoo.org> -+ * -+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED -+ * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. -+ * -+ * Permission is hereby granted to use or copy this program -+ * for any purpose, provided the above notices are retained on all copies. -+ * Permission to modify the code and to distribute modified code is granted, -+ * provided the above notices are retained, and a notice that the code was -+ * modified is included with the above copyright notice. -+ */ -+ -+#include "../all_aligned_atomic_load_store.h" -+#include "../test_and_set_t_is_ao_t.h" -+ -+/* Data dependence does not imply read ordering. */ -+#define AO_NO_DD_ORDERING -+ -+AO_INLINE void -+AO_nop_full() -+{ -+ __asm__ __volatile__( -+ " .set push \n" -+ " .set mips3 \n" -+ " .set noreorder \n" -+ " .set nomacro \n" -+ " sync \n" -+ " .set pop " -+ : : : "memory"); -+} -+ -+#define AO_HAVE_nop_full -+ -+AO_INLINE int -+AO_compare_and_swap(volatile AO_t *addr, AO_t old, AO_t new_val) -+{ -+ register int was_equal = 0; -+ register int temp; -+ -+ __asm__ __volatile__( -+ " .set push \n" -+ " .set mips3 \n" -+ " .set noreorder \n" -+ " .set nomacro \n" -+ "1: ll %0, %1 \n" -+ " bne %0, %4, 2f \n" -+ " move %0, %3 \n" -+ " sc %0, %1 \n" -+ " .set pop \n" -+ " beqz %0, 1b \n" -+ " li %2, 1 \n" -+ "2: " -+ : "=&r" (temp), "+R" (*addr), "+r" (was_equal) -+ : "r" (new_val), "r" (old) -+ : "memory"); -+ return was_equal; -+} -+ -+#define AO_HAVE_compare_and_swap -+ -+AO_INLINE AO_t -+AO_fetch_and_add_full (volatile AO_t *p, AO_t incr) -+{ -+ AO_t result, temp; -+ __asm__ __volatile__( -+ " .set push \n" -+ " .set mips3 \n" -+ " .set noreorder \n" -+ " .set nomacro \n" -+ "1: ll %1, %2 \n" -+ " addu %0, %1, %3 \n" -+ " sc %0, %2 \n" -+ " beqz %0, 1b \n" -+ " addu %0, %1, %3 \n" -+ " sync \n" -+ " .set pop \n" -+ : "=&r" (result), "=&r" (temp), "=m" (*p) -+ : "r" (incr), "m" (*p) -+ : "memory"); -+ return result; -+} -+ -+#define AO_HAVE_fetch_and_add_full -+ -+/* -+ * FIXME: fetch_and_add_full implemented, any others? -+ */ diff --git a/recipes/pulseaudio/libatomics-ops_1.2.bb b/recipes/pulseaudio/libatomics-ops_1.2.bb deleted file mode 100644 index a0e2d8f..0000000 --- a/recipes/pulseaudio/libatomics-ops_1.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "A library for atomic integer operations" -LICENSE = "MIT" - -PR = "r3" - -SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz \ - file://fedora/libatomic_ops-1.2-ppclwzfix.patch \ - file://gentoo/libatomic_ops-1.2-mips.patch \ - file://dont.install.header.twice.patch" - -S = "${WORKDIR}/libatomic_ops-${PV}" - -ARM_INSTRUCTION_SET = "arm" - -inherit autotools pkgconfig - -# Allow empty package to fix SDK depchains -ALLOW_EMPTY_${PN} = "1" - -FILES_${PN}-doc += "${datadir}/libatomic_ops/COPYING ${datadir}/libatomic_ops/*.txt" - -SRC_URI[md5sum] = "1b65e48271c81e3fa2d7a9a69bab7504" -SRC_URI[sha256sum] = "a3d8768aa8fd2f6ae79be2d756b3a6b48816b3889ae906be3d5ffb2de5a5c781" -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] libatomic-ops: switch to own directroy and use cvs version 2011-03-22 8:01 ` [PATCH 1/3] libatomic-ops: switch to own directroy and use cvs version heinold @ 2011-03-22 8:19 ` Koen Kooi 2011-03-22 9:00 ` Henning Heinold 0 siblings, 1 reply; 14+ messages in thread From: Koen Kooi @ 2011-03-22 8:19 UTC (permalink / raw) To: openembedded-devel -----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> > +++ b/recipes/libatomic-ops/libatomic-ops_cvs.bb > @@ -0,0 +1,15 @@ > +DESCRIPTION = "A library for atomic integer operations" > +LICENSE = "MIT" > + > +PV = "4.0+cvs${SRCDATE}" > + > +SRC_URI = "cvs://anonymous@bdwgc.cvs.sourceforge.net/cvsroot/bdwgc;module=bdwgc" > + > +S = "${WORKDIR}/bdwgc/libatomic_ops/" > + > +inherit autotools pkgconfig > + > +# Allow empty package to fix SDK depchains > +ALLOW_EMPTY_${PN} = "1" > + > +FILES_${PN}-doc += "${datadir}/libatomic_ops/COPYING ${datadir}/libatomic_ops/*.txt" Where are you setting SRCDATE for this recipe? -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) iD8DBQFNiFuaMkyGM64RGpERAkn6AKC5bgVE7shDA6lUCMmPVjP4NdqaagCfQ4L4 aenatxfKDnffrucGwrGnD7I= =N/3n -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] libatomic-ops: switch to own directroy and use cvs version 2011-03-22 8:19 ` Koen Kooi @ 2011-03-22 9:00 ` Henning Heinold 2011-03-22 9:05 ` Martin Jansa 2011-03-22 9:05 ` Koen Kooi 0 siblings, 2 replies; 14+ messages in thread From: Henning Heinold @ 2011-03-22 9:00 UTC (permalink / raw) To: openembedded-devel On Tue, Mar 22, 2011 at 09:19:38AM +0100, Koen Kooi wrote: > Where are you setting SRCDATE for this recipe? Ah sorry, I left this over for discussion and forget to mentioned it. Is it better in inside the recipe now or per the sane-revdate.inc? Bye Henning ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] libatomic-ops: switch to own directroy and use cvs version 2011-03-22 9:00 ` Henning Heinold @ 2011-03-22 9:05 ` Martin Jansa 2011-03-22 9:05 ` Koen Kooi 1 sibling, 0 replies; 14+ messages in thread From: Martin Jansa @ 2011-03-22 9:05 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 756 bytes --] On Tue, Mar 22, 2011 at 10:00:05AM +0100, Henning Heinold wrote: > On Tue, Mar 22, 2011 at 09:19:38AM +0100, Koen Kooi wrote: > > Where are you setting SRCDATE for this recipe? > > Ah sorry, > > I left this over for discussion and forget to mentioned it. > > Is it better in inside the recipe now or per the sane-revdate.inc? In recipe please http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=26b7830cab29b04c2a3db1799fb171550e7d83fb > > Bye Henning > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] libatomic-ops: switch to own directroy and use cvs version 2011-03-22 9:00 ` Henning Heinold 2011-03-22 9:05 ` Martin Jansa @ 2011-03-22 9:05 ` Koen Kooi 1 sibling, 0 replies; 14+ messages in thread From: Koen Kooi @ 2011-03-22 9:05 UTC (permalink / raw) To: openembedded-devel -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 22-03-11 10:00, Henning Heinold wrote: > On Tue, Mar 22, 2011 at 09:19:38AM +0100, Koen Kooi wrote: >> Where are you setting SRCDATE for this recipe? > > Ah sorry, > > I left this over for discussion and forget to mentioned it. > > Is it better in inside the recipe now or per the sane-revdate.inc? Inside the recipe please -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) iD8DBQFNiGZ1MkyGM64RGpERAkekAJ9HiQ84dKHflbMsr8qdfXx9KU5SagCeKcUZ m1/O5spy5V+heNSE65nYJFY= =AYaQ -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops 2011-03-22 8:01 Attempt to fix libatomic-ops heinold 2011-03-22 8:01 ` [PATCH 1/3] libatomic-ops: switch to own directroy and use cvs version heinold @ 2011-03-22 8:01 ` heinold 2011-03-22 8:31 ` Paul Menzel ` (2 more replies) 2011-03-22 8:01 ` [PATCH 3/3] pulseaudio.inc: " heinold 2 siblings, 3 replies; 14+ messages in thread From: heinold @ 2011-03-22 8:01 UTC (permalink / raw) To: openembedded-devel 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" + #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.*" -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops 2011-03-22 8:01 ` [PATCH 2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops heinold @ 2011-03-22 8:31 ` Paul Menzel 2011-03-22 9:07 ` Koen Kooi 2011-03-22 17:19 ` Khem Raj 2 siblings, 0 replies; 14+ messages in thread From: Paul Menzel @ 2011-03-22 8:31 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 1744 bytes --] 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 [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops 2011-03-22 8:01 ` [PATCH 2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops heinold 2011-03-22 8:31 ` Paul Menzel @ 2011-03-22 9:07 ` Koen Kooi 2011-03-22 17:19 ` Khem Raj 2 siblings, 0 replies; 14+ messages in thread From: Koen Kooi @ 2011-03-22 9:07 UTC (permalink / raw) To: openembedded-devel -----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----- ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops 2011-03-22 8:01 ` [PATCH 2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops heinold 2011-03-22 8:31 ` Paul Menzel 2011-03-22 9:07 ` Koen Kooi @ 2011-03-22 17:19 ` Khem Raj 2011-03-22 17:30 ` Henning Heinold 2 siblings, 1 reply; 14+ messages in thread From: Khem Raj @ 2011-03-22 17:19 UTC (permalink / raw) To: openembedded-devel 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 ? ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops 2011-03-22 17:19 ` Khem Raj @ 2011-03-22 17:30 ` Henning Heinold 2011-03-22 18:14 ` Khem Raj 2011-03-23 10:21 ` Phil Blundell 0 siblings, 2 replies; 14+ messages in thread From: Henning Heinold @ 2011-03-22 17:30 UTC (permalink / raw) To: openembedded-devel 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 ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops 2011-03-22 17:30 ` Henning Heinold @ 2011-03-22 18:14 ` Khem Raj 2011-03-23 10:21 ` Phil Blundell 1 sibling, 0 replies; 14+ messages in thread From: Khem Raj @ 2011-03-22 18:14 UTC (permalink / raw) To: openembedded-devel 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 -- -Khem ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops 2011-03-22 17:30 ` Henning Heinold 2011-03-22 18:14 ` Khem Raj @ 2011-03-23 10:21 ` Phil Blundell 1 sibling, 0 replies; 14+ messages in thread From: Phil Blundell @ 2011-03-23 10:21 UTC (permalink / raw) To: openembedded-devel 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. ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/3] pulseaudio.inc: let arm, mips and ppc depend on libatomic-ops 2011-03-22 8:01 Attempt to fix libatomic-ops heinold 2011-03-22 8:01 ` [PATCH 1/3] libatomic-ops: switch to own directroy and use cvs version heinold 2011-03-22 8:01 ` [PATCH 2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops heinold @ 2011-03-22 8:01 ` heinold 2 siblings, 0 replies; 14+ messages in thread From: heinold @ 2011-03-22 8:01 UTC (permalink / raw) To: openembedded-devel From: Henning Heinold <heinold@inf.fu-berlin.de> * bump INC_PR Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de> --- recipes/pulseaudio/pulseaudio.inc | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/recipes/pulseaudio/pulseaudio.inc b/recipes/pulseaudio/pulseaudio.inc index 85048f2..046a349 100644 --- a/recipes/pulseaudio/pulseaudio.inc +++ b/recipes/pulseaudio/pulseaudio.inc @@ -3,10 +3,16 @@ HOMEPAGE = "http://www.pulseaudio.org" AUTHOR = "Lennart Poettering" SECTION = "libs/multimedia" LICENSE = "LGPL" -DEPENDS = "bluez4 libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal virtual/libx11 tcp-wrappers" +DEPENDS = "bluez4 liboil avahi libsamplerate0 libsndfile1 libtool hal virtual/libx11 tcp-wrappers" # optional DEPENDS += "alsa-lib glib-2.0 dbus consolekit hal openssl" -INC_PR = "r11" + +DEPENDS_append_arm = " libatomic-ops" +DEPENDS_append_mips = " libatomic-ops" +DEPENDS_append_mipsel = " libatomic-ops" +DEPENDS_append_ppc = " libatomic-ops" + +INC_PR = "r12" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ file://gcc4-compile-fix.patch \ -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2011-03-23 10:23 UTC | newest] Thread overview: 14+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-03-22 8:01 Attempt to fix libatomic-ops heinold 2011-03-22 8:01 ` [PATCH 1/3] libatomic-ops: switch to own directroy and use cvs version heinold 2011-03-22 8:19 ` Koen Kooi 2011-03-22 9:00 ` Henning Heinold 2011-03-22 9:05 ` Martin Jansa 2011-03-22 9:05 ` Koen Kooi 2011-03-22 8:01 ` [PATCH 2/3] cairo.inc: let arm, mips and ppc depend on libatomic-ops heinold 2011-03-22 8:31 ` Paul Menzel 2011-03-22 9:07 ` Koen Kooi 2011-03-22 17:19 ` Khem Raj 2011-03-22 17:30 ` Henning Heinold 2011-03-22 18:14 ` Khem Raj 2011-03-23 10:21 ` Phil Blundell 2011-03-22 8:01 ` [PATCH 3/3] pulseaudio.inc: " heinold
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.