From 9c3dd1a2cdf6ea2c61406d4b50f378bd2ab91dba Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Sun, 27 Feb 2011 22:25:17 +0000
Subject: yajl: use direct patch from Github.

---
 Library/Formula/yajl.rb | 37 +------------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/yajl.rb b/Library/Formula/yajl.rb
index 32a38283a..924f5c3ec 100644
--- a/Library/Formula/yajl.rb
+++ b/Library/Formula/yajl.rb
@@ -7,8 +7,7 @@ class Yajl <Formula
 
   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
+    "https://github.com/lloyd/yajl/commit/a31c4d0f9ad90b4b58508702fd877bb35039067e.patch"
   end
 
   # Configure uses cmake, even though it looks like we're
@@ -23,37 +22,3 @@ 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