diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-02-21 19:51:08 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-02-21 19:53:33 +0100 |
| commit | e9ac1c821e4493d5ca0d3a0e671f54ad60ce7c43 (patch) | |
| tree | 5d344ddb14604e621121df0cf972a3dd7e76b0fe /package/yajl/patches | |
| parent | b752d86ec4fc9824935bb03bad6086c6bb524aa2 (diff) | |
yajl: update to latest, change to cmake build style
Diffstat (limited to 'package/yajl/patches')
| -rw-r--r-- | package/yajl/patches/patch-CMakeLists_txt | 18 | ||||
| -rw-r--r-- | package/yajl/patches/patch-configure | 20 |
2 files changed, 10 insertions, 28 deletions
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" |