summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/yajl/Makefile16
-rw-r--r--package/yajl/patches/patch-CMakeLists_txt18
-rw-r--r--package/yajl/patches/patch-configure20
3 files changed, 16 insertions, 38 deletions
diff --git a/package/yajl/Makefile b/package/yajl/Makefile
index 01d3fd8cb..f81ccf66b 100644
--- a/package/yajl/Makefile
+++ b/package/yajl/Makefile
@@ -4,28 +4,24 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= yajl
-PKG_VERSION:= 2.0.1
+PKG_VERSION:= 2.1.0
PKG_RELEASE:= 1
-PKG_HASH:= 6bc3737623490e0a1b5f52bd09903c6f8c360f3338079db19895e95bb940a4da
-PKG_DESCR:= small event-driven json parser written in ansi c
+PKG_HASH:= 510a13e0be57cd4ba99e60ac806a3635854af51316d3131d3742a90298ccde38
+PKG_DESCR:= small event-driven json parser
PKG_SECTION:= libs/data
PKG_BUILDDEP:= cmake-host ruby-host
PKG_URL:= http://lloyd.github.com/yajl/
-PKG_SITES:= http://distfiles.openadk.org/
+PKG_SITES:= http://github.com/lloyd/yajl/tarball/$(PKG_VERSION)/
PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-PKG_NOPARALLEL:= 1
+WRKDIST= $(WRKDIR)/lloyd-yajl-66cb08c/
include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,YAJL,yajl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-CONFIG_STYLE:= manual
-
-do-configure:
- (cd ${WRKBUILD} && PATH='${HOST_PATH}' ./configure --prefix /usr)
+CONFIG_STYLE:= cmake
yajl-install:
$(INSTALL_DIR) $(IDIR_YAJL)/usr/lib
diff --git a/package/yajl/patches/patch-CMakeLists_txt b/package/yajl/patches/patch-CMakeLists_txt
index 4f0b3f936..985e2a5e4 100644
--- a/package/yajl/patches/patch-CMakeLists_txt
+++ b/package/yajl/patches/patch-CMakeLists_txt
@@ -1,6 +1,6 @@
---- yajl-2.0.1.orig/CMakeLists.txt 2011-04-28 04:48:41.000000000 +0200
-+++ yajl-2.0.1/CMakeLists.txt 2014-01-11 13:05:10.000000000 +0100
-@@ -64,16 +64,5 @@ ENDIF (WIN32)
+--- lloyd-yajl-66cb08c/.orig/CMakeLists.txt 2014-03-19 05:58:29.000000000 +0100
++++ lloyd-yajl-66cb08c//CMakeLists.txt 2016-02-21 11:46:05.000000000 +0100
+@@ -64,18 +64,4 @@ ENDIF (WIN32)
ADD_SUBDIRECTORY(src)
@@ -9,11 +9,13 @@
-ADD_SUBDIRECTORY(verify)
-ADD_SUBDIRECTORY(example)
-ADD_SUBDIRECTORY(perf)
-
--INCLUDE(YAJLDoc.cmake)
-
+-INCLUDE(YAJLDoc.cmake)
+
-# a test target
-ADD_CUSTOM_TARGET(test
-- ./run_tests.sh ${CMAKE_CURRENT_BINARY_DIR}/test/yajl_test
-- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
-
+- ./run_tests.sh ${CMAKE_CURRENT_BINARY_DIR}/test/parsing/yajl_test
+- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test/parsing)
+-
+-ADD_CUSTOM_TARGET(test-api ${CMAKE_CURRENT_SOURCE_DIR}/test/api/run_tests.sh
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test/api)
diff --git a/package/yajl/patches/patch-configure b/package/yajl/patches/patch-configure
deleted file mode 100644
index 1153f407c..000000000
--- a/package/yajl/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- yajl-2.0.1.orig/configure 2011-04-28 04:48:41.000000000 +0200
-+++ yajl-2.0.1/configure 2014-01-11 13:06:37.000000000 +0100
-@@ -38,7 +38,7 @@ FileUtils.rm_f("Makefile")
- puts "== running CMake in build directory"
- FileUtils.mkdir("build")
- FileUtils.cd("build") do
-- if (!system("cmake -DCMAKE_INSTALL_PREFIX='#{prefix}' .."))
-+ if (!system("cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_INSTALL_PREFIX='#{prefix}' .."))
- puts "The \"cmake\" program is required to configure yajl. It's"
- puts "available from most ports/packaging systems and http://cmake.org"
- exit 1
-@@ -49,7 +49,7 @@ end
- puts "== Generating Makefile"
- File.open("Makefile", "w+") do |f|
- f.puts ".PHONY: all clean distclean install package test distro"
-- f.puts "all: distro doc test"
-+ f.puts "all: distro"
- f.puts
- f.puts "distro:"
- f.puts " @cd build && make"