From 501363db19756c4f82a67b822a00e8444d3962cf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 12 Jan 2014 12:25:26 +0100 Subject: fix build on Darwin --- package/yajl/Makefile | 4 +++- package/yajl/patches/patch-CMakeLists_txt | 4 ++-- package/yajl/patches/patch-configure | 11 ++++++++++- 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'package/yajl') diff --git a/package/yajl/Makefile b/package/yajl/Makefile index 79248e4d9..ff1537599 100644 --- a/package/yajl/Makefile +++ b/package/yajl/Makefile @@ -14,6 +14,8 @@ PKG_URL:= http://lloyd.github.com/yajl/ PKG_SITES:= http://openadk.org/distfiles/ PKG_OPTS:= dev +PKG_NOPARALLEL:= 1 + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,YAJL,yajl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) @@ -21,7 +23,7 @@ $(eval $(call PKG_template,YAJL,yajl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS CONFIG_STYLE:= manual do-configure: - (cd ${WRKBUILD} && PATH='${TARGET_PATH}' ./configure --prefix /usr) + (cd ${WRKBUILD} && PATH='${HOST_PATH}' ./configure --prefix /usr) 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 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| -- cgit v1.2.3