[oe-commits] Christopher Larson : libatomic-ops: move to recipes-support, fix recipe name

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: b0e7b52eaa97ec15a914f07e3f9779e7fab5b695
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b0e7b52eaa97ec15a914f07e3f9779e7fab5b695

Author: Christopher Larson <kergoth at gmail.com>
Date:   Mon Aug 24 15:19:44 2015 -0700

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.

Signed-off-by: Christopher Larson <kergoth at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/guile/guile_2.0.11.bb                             | 2 +-
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc                       | 2 +-
 meta/recipes-support/bdwgc/bdwgc_7.4.2.bb                               | 2 +-
 .../libatomic-ops/libatomic-ops_7.4.2.bb}                               | 1 +
 meta/recipes-support/libunwind/libunwind.inc                            | 2 +-
 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 71f696e..4869694 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"
 
 DEPENDS = "libunistring bdwgc gmp libtool libffi ncurses readline"
 # add guile-native only to the target recipe's DEPENDS
-DEPENDS_append_class-target = " guile-native libatomics-ops"
+DEPENDS_append_class-target = " guile-native libatomic-ops"
 
 RDEPENDS_${PN}_append_libc-glibc_class-target = "glibc-gconv-iso8859-1"
 
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 3389ec9..a098473 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 \
                     file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://src/pulsecore/resampler.h;beginline=4;endline=21;md5=09794012ae16912c0270f3280cc8ff84"
 
-DEPENDS = "libatomics-ops liboil libsndfile1 libtool"
+DEPENDS = "libatomic-ops liboil libsndfile1 libtool"
 # optional
 DEPENDS += "udev alsa-lib glib-2.0 dbus gconf"
 DEPENDS += "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 23ec954..1ca8cf7 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
 
 # by default use external libatomic-ops
 PACKAGECONFIG ??= "libatomic-ops"
-PACKAGECONFIG[libatomic-ops] = "--with-libatomic-ops=yes,--with-libatomic-ops=no,libatomics-ops"
+PACKAGECONFIG[libatomic-ops] = "--with-libatomic-ops=yes,--with-libatomic-ops=no,libatomic-ops"
 
 BBCLASSEXTEND = "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
similarity index 96%
rename from meta/recipes-multimedia/pulseaudio/libatomics-ops_7.4.2.bb
rename to meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb
index 26faabb..4d0e299 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 @@
 SUMMARY = "A library for atomic integer operations"
 HOMEPAGE = "https://github.com/ivmai/libatomic_ops/"
 SECTION = "optional"
+PROVIDES += "libatomics-ops"
 LICENSE = "GPLv2 & MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://doc/LICENSING.txt;md5=e00dd5c8ac03a14c5ae5225a4525fa2d \
diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc
index c8eab58..6660af2 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
 HOMEPAGE = "http://www.nongnu.org/libunwind"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5"
-DEPENDS += "libatomics-ops"
+DEPENDS += "libatomic-ops"
 
 SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"