diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2014-01-12 12:25:26 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2014-01-12 12:25:26 +0100 |
| commit | 501363db19756c4f82a67b822a00e8444d3962cf (patch) | |
| tree | 3e8921519d40da6bd37c1b5b4460fa5743e98eea /package/yajl/patches | |
| parent | 73854ae887172448e95f9b39a2c94fd7369496d8 (diff) | |
fix build on Darwin
Diffstat (limited to 'package/yajl/patches')
| -rw-r--r-- | package/yajl/patches/patch-CMakeLists_txt | 4 | ||||
| -rw-r--r-- | package/yajl/patches/patch-configure | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/package/yajl/patches/patch-CMakeLists_txt b/package/yajl/patches/patch-CMakeLists_txt index c1405d6c9..4f0b3f936 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 2013-07-30 15:20:53.000000000 +0200 -@@ -64,16 +64,5 @@ ENDIF (WIN32) ++++ yajl-2.0.1/CMakeLists.txt 2014-01-11 13:05:10.000000000 +0100 +@@ -64,16 +64,5 @@ ENDIF (WIN32) ADD_SUBDIRECTORY(src) diff --git a/package/yajl/patches/patch-configure b/package/yajl/patches/patch-configure index 8ab73fc1c..1153f407c 100644 --- a/package/yajl/patches/patch-configure +++ b/package/yajl/patches/patch-configure @@ -1,5 +1,14 @@ --- yajl-2.0.1.orig/configure 2011-04-28 04:48:41.000000000 +0200 -+++ yajl-2.0.1/configure 2013-07-30 15:34:21.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| |