Commit b7988b0f authored by Andreas Wetzel's avatar Andreas Wetzel Committed by Peter Korsgaard
Browse files

bump json-c to 0.10 



this patch bumps json-c to version 0.10 and adapts the no-reentrant patch
to the new version.

Signed-off-by: default avatarAndreas Wetzel <andreas.wetzel@nanotronic.ch>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 06b3e4c5

package/json-c/json-c-no-reentrant.patch

+7 −9
Original line number Diff line number Diff line
@@ -8,26 +8,24 @@ patch to avoid having to autoreconfigure the package. 


Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Index: b/Makefile.am

Index: b/Makefile.am.inc

===================================================================

--- a/Makefile.am

+++ b/Makefile.am

@@ -1,4 +1,4 @@

--- a/Makefile.am.inc

+++ b/Makefile.am.inc

@@ -1,2 +1,2 @@

-AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT

+AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE

 

 EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc

 

Index: b/Makefile.in

===================================================================

--- a/Makefile.in

+++ b/Makefile.in

@@ -219,7 +219,7 @@

@@ -263,7 +263,7 @@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

-AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT

+AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE

 EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc

 EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj

 SUBDIRS = . tests

 lib_LTLIBRARIES = libjson.la
 
 pkgconfigdir = $(libdir)/pkgconfig

package/json-c/json-c.mk

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
#

################################################################################



JSON_C_VERSION = 0.9

JSON_C_SITE = http://oss.metaparadigm.com/json-c/

JSON_C_VERSION = 0.10

JSON_C_SITE = https://github.com/downloads/json-c/json-c

JSON_C_INSTALL_STAGING = YES



$(eval $(autotools-package))