diff options
| author | Jack Mitchell <jmitchell@cbnl.com> | 2013-11-18 16:14:25 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-20 14:03:04 +0000 |
| commit | 533c1db22eddaaaea7d58d1fc75d608b9ba8122a (patch) | |
| tree | 1508e547d214a8ff0e1b56a5fa63c1ce23c74359 | |
| parent | 9ae204660814a8dc50b67d6c35b872dfa78c17e1 (diff) | |
| download | openembedded-core-533c1db22eddaaaea7d58d1fc75d608b9ba8122a.tar.gz openembedded-core-533c1db22eddaaaea7d58d1fc75d608b9ba8122a.tar.bz2 openembedded-core-533c1db22eddaaaea7d58d1fc75d608b9ba8122a.zip | |
libjson: update to 0.11 and rename to json-c
libjson is now known as json-c. Config.status is removed as it breaks
seperate build dir builds. Built without parallel make as it fails,
official word is not to bother trying.
Signed-off-by: Jack Mitchell <jmitchell@cbnl.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/conf/distro/include/seperatebuilddir.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/json-c/json-c_0.11.bb | 20 | ||||
| -rw-r--r-- | meta/recipes-devtools/libjson/libjson_0.9.bb | 14 | ||||
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 |
4 files changed, 22 insertions, 16 deletions
diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc index c0671834d6..e1a5c6b43a 100644 --- a/meta/conf/distro/include/seperatebuilddir.inc +++ b/meta/conf/distro/include/seperatebuilddir.inc @@ -294,7 +294,7 @@ B_pn-libice = "${SEPB}" B_pn-libice-native = "${SEPB}" B_pn-libid3tag = "${SEPB}" B_pn-libidn = "${SEPB}" -B_pn-libjson = "${SEPB}" +B_pn-json-c = "${SEPB}" B_pn-libksba = "${SEPB}" B_pn-libmad = "${SEPB}" B_pn-libmatchbox = "${SEPB}" diff --git a/meta/recipes-devtools/json-c/json-c_0.11.bb b/meta/recipes-devtools/json-c/json-c_0.11.bb new file mode 100644 index 0000000000..831f281b69 --- /dev/null +++ b/meta/recipes-devtools/json-c/json-c_0.11.bb @@ -0,0 +1,20 @@ +SUMMARY = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C" +HOMEPAGE = "https://github.com/json-c/json-c/wiki" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" + +SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz" + +SRC_URI[md5sum] = "aa02367d2f7a830bf1e3376f77881e98" +SRC_URI[sha256sum] = "28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c" + +RPROVIDES_${PN} = "libjson" + +PARALLEL_MAKE = "" + +inherit autotools + +do_configure_prepend() { + # Clean up autoconf cruft that should not be in the tarball + rm ${S}/config.status +} diff --git a/meta/recipes-devtools/libjson/libjson_0.9.bb b/meta/recipes-devtools/libjson/libjson_0.9.bb deleted file mode 100644 index e4951a8cbd..0000000000 --- a/meta/recipes-devtools/libjson/libjson_0.9.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "JSON-C - A JSON implementation in C" -HOMEPAGE = "http://oss.metaparadigm.com/json-c/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=30a276a476b02c2dcd0849bde417fb17" - -SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz" -SRC_URI[md5sum] = "3a13d264528dcbaf3931b0cede24abae" -SRC_URI[sha256sum] = "702a486c9bf8e19137d484ab5c49b4ad314eb5e1fe37062a72c0a0fa39439475" - -S = "${WORKDIR}/json-c-${PV}" - - -inherit autotools diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index bb13f4b52e..7e87ef8d6b 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \ DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool" # optional DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" -DEPENDS += "libjson gdbm speex libxml-parser-perl-native" +DEPENDS += "json-c gdbm speex libxml-parser-perl-native" inherit autotools pkgconfig useradd gettext perlnative |