From 01e5bee40f7ae083a5d62c99667bb9709d266f16 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 25 Jan 2012 12:03:10 +0100 Subject: yajl: bump version Signed-off-by: Peter Korsgaard --- package/yajl/yajl-2.0.2-math-link.patch | 24 ------------------------ package/yajl/yajl-2.0.4-math-link.patch | 24 ++++++++++++++++++++++++ package/yajl/yajl.mk | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 package/yajl/yajl-2.0.2-math-link.patch create mode 100644 package/yajl/yajl-2.0.4-math-link.patch diff --git a/package/yajl/yajl-2.0.2-math-link.patch b/package/yajl/yajl-2.0.2-math-link.patch deleted file mode 100644 index 355a24856..000000000 --- a/package/yajl/yajl-2.0.2-math-link.patch +++ /dev/null @@ -1,24 +0,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 ---- - 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) diff --git a/package/yajl/yajl-2.0.4-math-link.patch b/package/yajl/yajl-2.0.4-math-link.patch new file mode 100644 index 000000000..355a24856 --- /dev/null +++ b/package/yajl/yajl-2.0.4-math-link.patch @@ -0,0 +1,24 @@ +[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 +--- + 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) diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index 723cce4a9..1c0df383b 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -4,7 +4,7 @@ # ################################################################################ -YAJL_VERSION = 2.0.2 +YAJL_VERSION = 2.0.4 YAJL_SITE = git://github.com/lloyd/yajl.git YAJL_INSTALL_STAGING = YES -- cgit v1.2.3