json-c update to version 0.10, using github downloads.

Squashed commit of the following:

commit a93e1e80e4a6b668009bd024923e387f71eff7a3
Author: Thomas Mayer <thomas@residuum.org>
Date:   Tue Jul 17 23:16:59 2012 +0200

    Patches for:
    	- missing file
    	- remove check for rpl_* functions

commit ad94ec0c30381acb9ac25db96182a1308b9fbd3c
Author: Thomas Mayer <thomas@residuum.org>
Date:   Tue Jul 17 19:08:40 2012 +0200

    Fixed indentation

commit 78b51e08e5174454495b8df547c4bccdc06bef73
Author: Thomas Mayer <thomas@residuum.org>
Date:   Tue Jul 17 01:13:08 2012 +0200

    json-c compiles correctly (finally).

commit 0c4bb3a6b4b6db1ac6a6d098ce55041db55bc8ab
Author: Thomas Mayer <thomas@residuum.org>
Date:   Fri Jul 13 22:16:41 2012 +0200

    Changes to json-c files according to current MXE standards.

commit a533fe5439d56de76c2d3b9d634c597cba94ff52
Author: Thomas Mayer <thomas@residuum.org>
Date:   Thu Jul 12 22:27:54 2012 +0200

    Update to json-c 0.10, and use github repository.
This commit is contained in:
Thomas Mayer 2012-07-17 23:18:18 +02:00
parent 7bd6681a4a
commit 03fcf50a34
4 changed files with 39 additions and 5 deletions

View File

@ -1285,7 +1285,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
</tr>
<tr>
<td id="json-c-package">json-c</td>
<td id="json-c-version">0.9</td>
<td id="json-c-version">0.10</td>
<td id="json-c-website"><a href="http://oss.metaparadigm.com/json-c/">json-c</a></td>
</tr>
<tr>

View File

@ -0,0 +1,15 @@
This file is part of MXE.
See index.html for further information.
Contains a fix for issue 35 on json-c (https://github.com/json-c/json-c/issues/35)
--- a/Makefile.am 2012-07-17 22:52:19.000000000 +0200
+++ b/Makefile.am 2012-07-17 22:54:09.000000000 +0200
@@ -17,6 +17,7 @@
json_config.h \
json_inttypes.h \
json_object.h \
+ json_object_iterator.h \
json_object_private.h \
json_tokener.h \
json_util.h \

View File

@ -0,0 +1,16 @@
This file is part of MXE.
See index.html for further information.
see http://lists.fedoraproject.org/pipermail/mingw/2009-May/001567.html
--- a/configure.in 2012-07-12 01:57:09.000000000 +0200
+++ b/configure.in 2012-07-12 01:59:06.000000000 +0200
@@ -25,8 +25,6 @@
# Checks for library functions.
AC_FUNC_VPRINTF
AC_FUNC_MEMCMP
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
AC_CHECK_FUNCS(strndup strerror vsnprintf vasprintf open vsyslog strncasecmp)
AM_PROG_LIBTOOL

View File

@ -3,23 +3,26 @@
PKG := json-c
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := daaf5eb960fa98e137abc5012f569b83c79be90f
$(PKG)_CHECKSUM := f90f643c8455da21d57b3e8866868a944a93c596
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://oss.metaparadigm.com/$(PKG)/$($(PKG)_FILE)
$(PKG)_URL := https://github.com/downloads/$(PKG)/$(PKG)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://oss.metaparadigm.com/json-c/?C=M;O=D' | \
$(SED) -n 's,.*json-c-\([0-9][^>]*\)\.tar.*,\1,p' | \
$(WGET) - q -O 'https://github.com/json-c/json-c/downloads' | \
grep '<a href="/downloads/json-c/json-c/' | \
$(SED) -n -s,.*href="/downloads/json-c/json-c/json-c-\([0-9.]*\).tar.gz,\1,p' | \
head -1
endef
define $(PKG)_BUILD
cd '$(1)' && ./autogen.sh
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--prefix='$(PREFIX)/$(TARGET)' \
--build="`config.guess`"\
--disable-shared
CFLAGS=-Wno-error
$(MAKE) -C '$(1)' -j '$(JOBS)' install
endef