From 672c33527d655b8b6816132ffedd2433126fc0f0 Mon Sep 17 00:00:00 2001
From: Justin Clift
Date: Fri, 18 Feb 2011 19:17:07 +1100
Subject: Update formula: yajl

All YAJL releases so far have an rpath bug, leaving them broken
on OSX.  There is a fix in upstream git.

This formula updates YAJL to the latest release and applies the
upstream patch to fix the rpath bug.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/yajl.rb | 44 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/yajl.rb b/Library/Formula/yajl.rb
index 85653b9bd..32a38283a 100644
--- a/Library/Formula/yajl.rb
+++ b/Library/Formula/yajl.rb
@@ -2,8 +2,14 @@ require 'formula'
 
 class Yajl <Formula
   homepage 'http://lloyd.github.com/yajl/'
-  url 'http://cloud.github.com/downloads/lloyd/yajl/yajl-1.0.9.tar.gz'
-  md5 '8643ff2fef762029e51c86882a4d0fc6'
+  url 'http://github.com/lloyd/yajl/tarball/1.0.11'
+  md5 '5b60f4d59b3b1fb42d7808d08460fb12'
+
+  def patches
+    # All YAJL releases so far have an rpath bug, though its fixed in upstream git:
+    # https://github.com/lloyd/yajl/commit/a31c4d0f9ad90b4b58508702fd877bb35039067e
+    DATA
+  end
 
   # Configure uses cmake, even though it looks like we're
   # just using autotools below.
@@ -17,3 +23,37 @@ class Yajl <Formula
     (include + 'yajl').install Dir['src/api/*.h']
   end
 end
+
+
+__END__
+diff -U 3 -r lloyd-yajl-f4baae0-orig/CMakeLists.txt lloyd-yajl-f4baae0/CMakeLists.txt
+--- lloyd-yajl-f4baae0-orig/CMakeLists.txt	2010-07-22 08:12:15.000000000 +1000
++++ lloyd-yajl-f4baae0/CMakeLists.txt	2011-02-18 19:04:46.000000000 +1100
+@@ -38,10 +38,6 @@
+ 
+ SET (YAJL_DIST_NAME "yajl-${YAJL_MAJOR}.${YAJL_MINOR}.${YAJL_MICRO}")
+ 
+-# RPATH handling -- given we statically link, we'll turn off
+-# unnec. rpath embedding
+-SET(CMAKE_SKIP_RPATH  TRUE)
+-
+ IF (NOT CMAKE_BUILD_TYPE)
+   SET(CMAKE_BUILD_TYPE "Release")
+ ENDIF (NOT CMAKE_BUILD_TYPE)
+diff -U 3 -r lloyd-yajl-f4baae0-orig/src/CMakeLists.txt lloyd-yajl-f4baae0/src/CMakeLists.txt
+--- lloyd-yajl-f4baae0-orig/src/CMakeLists.txt	2010-07-22 08:12:15.000000000 +1000
++++ lloyd-yajl-f4baae0/src/CMakeLists.txt	2011-02-18 19:06:02.000000000 +1100
+@@ -60,6 +60,13 @@
+                       SOVERSION ${YAJL_MAJOR}
+                       VERSION ${YAJL_MAJOR}.${YAJL_MINOR}.${YAJL_MICRO})
+ 
++#### ensure a .dylib has correct absolute installation paths upon installation
++IF(APPLE)
++  MESSAGE("INSTALL_NAME_DIR: ${CMAKE_INSTALL_PREFIX}/lib")
++  SET_TARGET_PROPERTIES(yajl PROPERTIES
++                        INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
++ENDIF(APPLE)
++
+ #### build up an sdk as a post build step
+ 
+ # create some directories
-- 
cgit v1.2.3