summaryrefslogtreecommitdiffstats
path: root/rules/json-c.make
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2014-06-25 15:50:02 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2014-06-25 16:04:24 +0200
commit6e7abee162b2a808249fafc1e8933764800ef702 (patch)
treee26af108f48ba78705eb1c83845fe6c1130159af /rules/json-c.make
parent1087a1fc811fc8500aee3c87e418fc6df8a5b8e6 (diff)
downloadptxdist-6e7abee162b2a808249fafc1e8933764800ef702.tar.gz
ptxdist-6e7abee162b2a808249fafc1e8933764800ef702.tar.xz
json-c: version bump 0.10 -> 0.12
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/json-c.make')
-rw-r--r--rules/json-c.make16
1 files changed, 10 insertions, 6 deletions
diff --git a/rules/json-c.make b/rules/json-c.make
index 9e354b204..a9a81652a 100644
--- a/rules/json-c.make
+++ b/rules/json-c.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_JSON_C) += json-c
#
# Paths and names
#
-JSON_C_VERSION := 0.10
-JSON_C_MD5 := a4edc79410eb894f08d7d52ca9f88732
+JSON_C_VERSION := 0.12
+JSON_C_MD5 := 3ca4bbb881dfc4017e8021b5e0a8c491
JSON_C := json-c-$(JSON_C_VERSION)
JSON_C_SUFFIX := tar.gz
JSON_C_URL := https://s3.amazonaws.com/json-c_releases/releases/$(JSON_C).$(JSON_C_SUFFIX)
@@ -29,13 +29,17 @@ JSON_C_LICENSE := MIT
# Prepare
# ----------------------------------------------------------------------------
-JSON_C_PATH := PATH=$(CROSS_PATH)
-JSON_C_ENV := $(CROSS_ENV)
+JSON_C_CONF_ENV := \
+ $(CROSS_ENV) \
+ CFLAGS="-O2 -g -Wno-error"
#
# autoconf
#
-JSON_C_AUTOCONF := $(CROSS_AUTOCONF_USR)
+JSON_C_CONF_TOOL := autoconf
+JSON_C_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --disable-static
# ----------------------------------------------------------------------------
# Target-Install
@@ -50,7 +54,7 @@ $(STATEDIR)/json-c.targetinstall:
@$(call install_fixup, json-c,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, json-c,DESCRIPTION,missing)
- @$(call install_lib, json-c, 0, 0, 0644, libjson)
+ @$(call install_lib, json-c, 0, 0, 0644, libjson-c)
@$(call install_finish, json-c)