diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-05-09 07:14:24 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-05-10 20:41:39 +0200 |
| commit | ecd0f65af92c224d9d17450ffdef00bd929bcfdf (patch) | |
| tree | d8ef7fa0aec061b10a44c636053f2c5c9e8f8ee9 /package/json-c/json-c-add-missing-file-to-installed-headers.patch | |
| parent | ee377acd8713330e54ef62babbc0b4a5c040446a (diff) | |
| download | buildroot-novena-ecd0f65af92c224d9d17450ffdef00bd929bcfdf.tar.gz buildroot-novena-ecd0f65af92c224d9d17450ffdef00bd929bcfdf.zip | |
json-c: bump to version 0.11
Bumping this package is needed, because json-c 0.10 has a major
defect: it installs a library named libjson.so, which conflicts with
the library installed by the libjson package.
This has been changed in the upstream json-c 0.11 version, which now
installs libjson-c and json-c.pc.
It allows to solve the Pulseaudio link problem, which wants to link
against json-c but happens to link against libjson when libjson has
been compiled and installed after json-c.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/json-c/json-c-add-missing-file-to-installed-headers.patch')
| -rw-r--r-- | package/json-c/json-c-add-missing-file-to-installed-headers.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/package/json-c/json-c-add-missing-file-to-installed-headers.patch b/package/json-c/json-c-add-missing-file-to-installed-headers.patch deleted file mode 100644 index 12ef8558d..000000000 --- a/package/json-c/json-c-add-missing-file-to-installed-headers.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2ab6524ca0cfaab7feb42f7c328db8fca7b111fc Mon Sep 17 00:00:00 2001 -From: Gilles Talis <gilles.talis@gmail.com> -Date: Tue, 5 Mar 2013 21:59:11 -0800 -Subject: [PATCH] Add json_object_iterator.h to installed headers - -Backported from: 4154c55edae6f6b34d6ef4fcc331055fdf8e1a23 - -In addition to original patch, applied the same change to Makefile.in -to avoid having the package to be autoreconfigured. - -Signed-off-by: Gilles Talis <gilles.talis@gmail.com> ---- - Makefile.am | 1 + - Makefile.in | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index d4a7bbb..8f09ca8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -17,6 +17,7 @@ libjsoninclude_HEADERS = \ - json_config.h \ - json_inttypes.h \ - json_object.h \ -+ json_object_iterator.h \ - json_object_private.h \ - json_tokener.h \ - json_util.h \ -diff --git a/Makefile.in b/Makefile.in -index c06db3e..9d924cd 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -278,6 +278,7 @@ libjsoninclude_HEADERS = \ - json_config.h \ - json_inttypes.h \ - json_object.h \ -+ json_object_iterator.h \ - json_object_private.h \ - json_tokener.h \ - json_util.h \ --- -1.7.10.4 - |