summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChristopher Larson <kergoth@gmail.com>2015-08-24 15:19:44 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 12:35:59 +0100
commita91e6f6c754721ff4d9624632a6275e6e69841ad (patch)
treea764045e41d97e86784ba87d967cbaeb3ae11688 /meta
parent3ffad2d4cb06ea141bd51ef36b96d33eeb6f9411 (diff)
downloadpoky-a91e6f6c754721ff4d9624632a6275e6e69841ad.tar.gz
libatomic-ops: move to recipes-support, fix recipe name
- This recipe is useful for more than just pulseaudio, so move it to recipes-support. - Rename to the correct upstream name, which corresponds to the library name. Keep a PROVIDES of libatomics-ops for compatibility. (From OE-Core rev: 5014de67fa6da1672626e3ec92fc51430fca3262) (From OE-Core rev: 5a14d4f981c2c12c274fade518d23706dca5889b) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.11.bb2
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc2
-rw-r--r--meta/recipes-support/bdwgc/bdwgc_7.4.2.bb2
-rw-r--r--meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb (renamed from meta/recipes-multimedia/pulseaudio/libatomics-ops_7.4.2.bb)1
-rw-r--r--meta/recipes-support/libunwind/libunwind.inc2
5 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb b/meta/recipes-devtools/guile/guile_2.0.11.bb
index 71f696e774..486969422c 100644
--- a/meta/recipes-devtools/guile/guile_2.0.11.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.11.bb
@@ -37,7 +37,7 @@ BBCLASSEXTEND = "native"
37 37
38DEPENDS = "libunistring bdwgc gmp libtool libffi ncurses readline" 38DEPENDS = "libunistring bdwgc gmp libtool libffi ncurses readline"
39# add guile-native only to the target recipe's DEPENDS 39# add guile-native only to the target recipe's DEPENDS
40DEPENDS_append_class-target = " guile-native libatomics-ops" 40DEPENDS_append_class-target = " guile-native libatomic-ops"
41 41
42RDEPENDS_${PN}_append_libc-glibc_class-target = "glibc-gconv-iso8859-1" 42RDEPENDS_${PN}_append_libc-glibc_class-target = "glibc-gconv-iso8859-1"
43 43
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 3389ec9916..a098473878 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
7 file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 7 file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
8 file://src/pulsecore/resampler.h;beginline=4;endline=21;md5=09794012ae16912c0270f3280cc8ff84" 8 file://src/pulsecore/resampler.h;beginline=4;endline=21;md5=09794012ae16912c0270f3280cc8ff84"
9 9
10DEPENDS = "libatomics-ops liboil libsndfile1 libtool" 10DEPENDS = "libatomic-ops liboil libsndfile1 libtool"
11# optional 11# optional
12DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" 12DEPENDS += "udev alsa-lib glib-2.0 dbus gconf"
13DEPENDS += "json-c gdbm speexdsp libxml-parser-perl-native libcap" 13DEPENDS += "json-c gdbm speexdsp libxml-parser-perl-native libcap"
diff --git a/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb b/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb
index 23ec95419c..1ca8cf77eb 100644
--- a/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb
+++ b/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb
@@ -36,6 +36,6 @@ inherit autotools pkgconfig
36 36
37# by default use external libatomic-ops 37# by default use external libatomic-ops
38PACKAGECONFIG ??= "libatomic-ops" 38PACKAGECONFIG ??= "libatomic-ops"
39PACKAGECONFIG[libatomic-ops] = "--with-libatomic-ops=yes,--with-libatomic-ops=no,libatomics-ops" 39PACKAGECONFIG[libatomic-ops] = "--with-libatomic-ops=yes,--with-libatomic-ops=no,libatomic-ops"
40 40
41BBCLASSEXTEND = "native nativesdk" 41BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops_7.4.2.bb b/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb
index 26faabb1bf..4d0e299f4f 100644
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops_7.4.2.bb
+++ b/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb
@@ -1,6 +1,7 @@
1SUMMARY = "A library for atomic integer operations" 1SUMMARY = "A library for atomic integer operations"
2HOMEPAGE = "https://github.com/ivmai/libatomic_ops/" 2HOMEPAGE = "https://github.com/ivmai/libatomic_ops/"
3SECTION = "optional" 3SECTION = "optional"
4PROVIDES += "libatomics-ops"
4LICENSE = "GPLv2 & MIT" 5LICENSE = "GPLv2 & MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
6 file://doc/LICENSING.txt;md5=e00dd5c8ac03a14c5ae5225a4525fa2d \ 7 file://doc/LICENSING.txt;md5=e00dd5c8ac03a14c5ae5225a4525fa2d \
diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc
index c8eab5882d..6660af22c5 100644
--- a/meta/recipes-support/libunwind/libunwind.inc
+++ b/meta/recipes-support/libunwind/libunwind.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "a portable and efficient C programming interface (API) to determi
2HOMEPAGE = "http://www.nongnu.org/libunwind" 2HOMEPAGE = "http://www.nongnu.org/libunwind"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5"
5DEPENDS += "libatomics-ops" 5DEPENDS += "libatomic-ops"
6 6
7SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" 7SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
8 8