[OE-core] [PATCH 06/12] json-c: Upgrade to 0.12

[Martin Jansa]

On Tue, Jan 06, 2015 at 07:42:16AM -0800, Saul Wold wrote:
> Added CFLAGS to prevent compiler error of unused size variable
> 
> Signed-off-by: Saul Wold <sgw at linux.intel.com>
> ---
>  meta/recipes-devtools/json-c/{json-c_0.11.bb => json-c_0.12.bb} | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>  rename meta/recipes-devtools/json-c/{json-c_0.11.bb => json-c_0.12.bb} (75%)
> 
> diff --git a/meta/recipes-devtools/json-c/json-c_0.11.bb b/meta/recipes-devtools/json-c/json-c_0.12.bb
> similarity index 75%
> rename from meta/recipes-devtools/json-c/json-c_0.11.bb
> rename to meta/recipes-devtools/json-c/json-c_0.12.bb
> index 389e0f9..79cf6dc 100644
> --- a/meta/recipes-devtools/json-c/json-c_0.11.bb
> +++ b/meta/recipes-devtools/json-c/json-c_0.12.bb
> @@ -6,8 +6,8 @@ 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"
> +SRC_URI[md5sum] = "3ca4bbb881dfc4017e8021b5e0a8c491"
> +SRC_URI[sha256sum] = "000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f"
>  
>  RPROVIDES_${PN} = "libjson"

^ This isn't correct anymore (isn't compatible with libjson).

0.12 doesn't install libjson shim (json.pc) anymore and libjson libs are
gone as well:

See:
https://github.com/json-c/json-c/commit/c8ee9196420c4b7c295a38c397a4e315df1baa03

as results it breaks couple recipes in world builds:
  /home/jenkins/oe/world/shr-core/meta-webos-ports/meta-luneui/recipes-webos/luna-sysmgr-common/luna-sysmgr-common.bb, do_compile
  /home/jenkins/oe/world/shr-core/meta-smartphone/meta-android/recipes-android/suspend-blocker/suspend-blocker.bb, do_compile
  /home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb, do_compile
and a lot more which depend on luna-sysmgr-common so they aren't shown.

OE qemux86 at luneos ~/webos/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/json-c $ ls -lR 0.1*/image/usr/lib/
0.11-r0/image/usr/lib/:
total 240
-rw-r--r-- 2 bitbake bitbake 121584 Jan  9 10:48 libjson-c.a
-rwxr-xr-x 2 bitbake bitbake    925 Jan  9 10:48 libjson-c.la
lrwxrwxrwx 1 bitbake bitbake     18 Jan  9 10:48 libjson-c.so -> libjson-c.so.2.0.1
lrwxrwxrwx 1 bitbake bitbake     18 Jan  9 10:48 libjson-c.so.2 -> libjson-c.so.2.0.1
-rwxr-xr-x 2 bitbake bitbake  95836 Jan  9 10:48 libjson-c.so.2.0.1
-rw-r--r-- 2 bitbake bitbake   1780 Jan  9 10:48 libjson.a
-rwxr-xr-x 2 bitbake bitbake    934 Jan  9 10:48 libjson.la
lrwxrwxrwx 1 bitbake bitbake     16 Jan  9 10:48 libjson.so -> libjson.so.0.1.0
lrwxrwxrwx 1 bitbake bitbake     16 Jan  9 10:48 libjson.so.0 -> libjson.so.0.1.0
-rwxr-xr-x 2 bitbake bitbake   5752 Jan  9 10:48 libjson.so.0.1.0
drwxr-xr-x 2 bitbake bitbake   4096 Jan  9 10:48 pkgconfig

0.11-r0/image/usr/lib/pkgconfig:
total 8
-rw-r--r-- 2 bitbake bitbake 205 Jan  9 10:48 json-c.pc
-rw-r--r-- 2 bitbake bitbake 201 Jan  9 10:48 json.pc

0.12-r0/image/usr/lib/:
total 252
-rw-r--r-- 3 bitbake bitbake 138592 Jan  9 12:04 libjson-c.a
-rwxr-xr-x 3 bitbake bitbake    925 Jan  9 12:04 libjson-c.la
lrwxrwxrwx 1 bitbake bitbake     18 Jan  9 12:04 libjson-c.so -> libjson-c.so.2.0.1
lrwxrwxrwx 1 bitbake bitbake     18 Jan  9 12:04 libjson-c.so.2 -> libjson-c.so.2.0.1
-rwxr-xr-x 3 bitbake bitbake 108728 Jan  9 12:04 libjson-c.so.2.0.1
drwxr-xr-x 2 bitbake bitbake   4096 Jan  9 12:04 pkgconfig

0.12-r0/image/usr/lib/pkgconfig:
total 4
-rw-r--r-- 3 bitbake bitbake 205 Jan  9 12:04 json-c.pc

> @@ -19,3 +19,5 @@ do_configure_prepend() {
>      # Clean up autoconf cruft that should not be in the tarball
>      rm -f ${S}/config.status
>  }
> +
> +CFLAGS += "-Wno-error=unused-but-set-variable"
> -- 
> 2.1.0
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20150109/69446363/attachment-0002.sig>