yajl: Bump version to 2.1.0

From a36814a6f9fbb62f49897f9fb1e68d204602e199 Mon Sep 17 00:00:00 2001

From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

Date: Tue, 2 Feb 2016 17:28:31 +0100

Subject: [PATCH] cmake: uClibc: Fix missing libm for tests

At the link time, the tests are not linked against libm which cause an

error with uClibc based toolchain:

../../yajl-2.1.0/lib/libyajl.so.2.1.0: undefined reference to `__isnan'

../../yajl-2.1.0/lib/libyajl.so.2.1.0: undefined reference to `__isinf'

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

---

 test/api/CMakeLists.txt | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/api/CMakeLists.txt b/test/api/CMakeLists.txt

index cd65a54..e0ce2f6 100644

--- a/test/api/CMakeLists.txt

+++ b/test/api/CMakeLists.txt

@@ -21,5 +21,5 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../${YAJL_DIST_NAME}/lib)

 FOREACH (test ${TESTS})

   GET_FILENAME_COMPONENT(testProg ${test} NAME_WE)

   ADD_EXECUTABLE(${testProg} ${test})

-  TARGET_LINK_LIBRARIES(${testProg} yajl)

+  TARGET_LINK_LIBRARIES(${testProg} yajl m)

 ENDFOREACH()

-- 

2.7.0

[PATCH] fix json_reformat linking on uClibc

json_reformat calls yajl_gen_* functions, which internally use isnan() /

isinf(). On Glibc, these are provided by libc, but on uClibc you need to

link with -lm (like the spec says), so ensure we do so.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

---

 reformatter/CMakeLists.txt |    2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

Index: yajl-2.0.2/reformatter/CMakeLists.txt

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

--- yajl-2.0.2.orig/reformatter/CMakeLists.txt

+++ yajl-2.0.2/reformatter/CMakeLists.txt

@@ -26,7 +26,7 @@

 ADD_EXECUTABLE(json_reformat ${SRCS})

-TARGET_LINK_LIBRARIES(json_reformat yajl_s)

+TARGET_LINK_LIBRARIES(json_reformat yajl_s m)

 # copy the binary into the output directory

 GET_TARGET_PROPERTY(binPath json_reformat LOCATION)

From bb4fb7ff71fd6cadd9c1bf8716845a91e5998c0c Mon Sep 17 00:00:00 2001

From: Samuel Martin <s.martin49@gmail.com>

Date: Sun, 31 Aug 2014 00:39:11 +0200

Subject: [PATCH 2/2] cmake: disable shared library build when

 BUILD_SHARED_LIBS is off

From b3cddf92adacfe5ca40574afb3e323cc7cdebc5c Mon Sep 17 00:00:00 2001

From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

Date: Tue, 2 Feb 2016 15:46:09 +0100

Subject: [PATCH] cmake: Add shared library conditonnal build

When BUILD_SHARED_LIBS is off, you don't want to build the shared

library.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>

---

 1 file changed, 4 insertions(+)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

index e36b736..6a24424 100644

index 99cf9e9..9e9c77d 100644

--- a/src/CMakeLists.txt

+++ b/src/CMakeLists.txt

@@ -37,6 +37,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir})

 #### build up an sdk as a post build step

@@ -78,7 +80,9 @@ INCLUDE_DIRECTORIES(${incDir}/..)

 IF(NOT WIN32)

@@ -77,10 +79,12 @@ INCLUDE_DIRECTORIES(${incDir}/..)

 # at build time you may specify the cmake variable LIB_SUFFIX to handle

 # 64-bit systems which use 'lib64'

+IF(BUILD_SHARED_LIBS)

   INSTALL(TARGETS yajl LIBRARY DESTINATION lib${LIB_SUFFIX})

 INSTALL(TARGETS yajl

         RUNTIME DESTINATION lib${LIB_SUFFIX}

         LIBRARY DESTINATION lib${LIB_SUFFIX}

         ARCHIVE DESTINATION lib${LIB_SUFFIX})

+ENDIF(BUILD_SHARED_LIBS)

 INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})

 INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl)

 INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl)

-- 

2.1.0

2.7.0

# Locally calculated

sha256	0e78f516dc53ecce7dc073f9a9bb0343186b58ef29dcd1dad74e5e853b216dd5  yajl-2.0.4.tar.gz

sha256	3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a  yajl-2.1.0.tar.gz

sha256	0f075b5f9a38bc02077370d4d57d12e615cfaaf7f634e3f2fc746b6582854e53  6d09f11b8fd358cab0e31b965327e64a599f9ce9.patch

#

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

YAJL_VERSION = 2.0.4

YAJL_VERSION = 2.1.0

YAJL_SITE = $(call github,lloyd,yajl,$(YAJL_VERSION))

YAJL_INSTALL_STAGING = YES

YAJL_LICENSE = ISC