From 5a14d4f981c2c12c274fade518d23706dca5889b Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 24 Aug 2015 15:19:44 -0700 Subject: 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) Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- meta/recipes-devtools/guile/guile_2.0.11.bb | 2 +- .../pulseaudio/libatomics-ops_7.4.2.bb | 28 --------------------- 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 | 29 ++++++++++++++++++++++ meta/recipes-support/libunwind/libunwind.inc | 2 +- 6 files changed, 33 insertions(+), 32 deletions(-) delete mode 100644 meta/recipes-multimedia/pulseaudio/libatomics-ops_7.4.2.bb create mode 100644 meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb (limited to 'meta') 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" 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/libatomics-ops_7.4.2.bb b/meta/recipes-multimedia/pulseaudio/libatomics-ops_7.4.2.bb deleted file mode 100644 index 26faabb1bf..0000000000 --- a/meta/recipes-multimedia/pulseaudio/libatomics-ops_7.4.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "A library for atomic integer operations" -HOMEPAGE = "https://github.com/ivmai/libatomic_ops/" -SECTION = "optional" -LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://doc/LICENSING.txt;md5=e00dd5c8ac03a14c5ae5225a4525fa2d \ - " - -SRC_URI = "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${PV}.tar.gz" - -SRC_URI[md5sum] = "1d6538604b314d2fccdf86915e5c0857" -SRC_URI[sha256sum] = "04fa615f62992547bcbda562260e28b504bc4c06e2f985f267f3ade30304b5dd" - -S = "${WORKDIR}/libatomic_ops-${PV}" - -ALLOW_EMPTY_${PN} = "1" - -ARM_INSTRUCTION_SET = "arm" - -inherit autotools pkgconfig - -do_install_append() { - # those contain only docs, not necessary for now. - install -m 0755 -d ${D}${docdir} - mv ${D}${datadir}/libatomic_ops ${D}${docdir}/${BPN} -} - -BBCLASSEXTEND = "native nativesdk" 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 \ 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 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 # 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-support/libatomic-ops/libatomic-ops_7.4.2.bb b/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb new file mode 100644 index 0000000000..4d0e299f4f --- /dev/null +++ b/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb @@ -0,0 +1,29 @@ +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 \ + " + +SRC_URI = "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${PV}.tar.gz" + +SRC_URI[md5sum] = "1d6538604b314d2fccdf86915e5c0857" +SRC_URI[sha256sum] = "04fa615f62992547bcbda562260e28b504bc4c06e2f985f267f3ade30304b5dd" + +S = "${WORKDIR}/libatomic_ops-${PV}" + +ALLOW_EMPTY_${PN} = "1" + +ARM_INSTRUCTION_SET = "arm" + +inherit autotools pkgconfig + +do_install_append() { + # those contain only docs, not necessary for now. + install -m 0755 -d ${D}${docdir} + mv ${D}${datadir}/libatomic_ops ${D}${docdir}/${BPN} +} + +BBCLASSEXTEND = "native nativesdk" 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 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" -- cgit 1.2.3-korg