From 973e78c9aee74157a3f817cd66783b8f0eec5311 Mon Sep 17 00:00:00 2001 From: Yoji SHIDARA Date: Mon, 2 Jul 2012 12:32:04 +0900 Subject: [PATCH] groonga 2.0.4 Closes Homebrew/homebrew#13153. Signed-off-by: Adam Vandenberg --- Formula/groonga.rb | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/Formula/groonga.rb b/Formula/groonga.rb index 259d5b55f09..bb6a9fddf59 100644 --- a/Formula/groonga.rb +++ b/Formula/groonga.rb @@ -2,13 +2,35 @@ require 'formula' class Groonga < Formula homepage 'http://groonga.org/' - url 'http://packages.groonga.org/source/groonga/groonga-2.0.3.tar.gz' - sha1 'a9dffb17bf722f12c45c43d56243d8c72a31f8c8' + url 'http://packages.groonga.org/source/groonga/groonga-2.0.4.tar.gz' + sha1 '1000fd087a382da7e7e5f8679fbaa3b61b3e954e' depends_on 'msgpack' + # Patches are upstream and should be removed in the next release. See: + # https://github.com/groonga/groonga/commit/690db3c1610cba7c8e4225a64ded72a1fe90053a + # https://github.com/groonga/groonga/commit/26ec2251c28dda151c66f4a530f2330d009edb32 + def patches + DATA + end + def install system "./configure", "--prefix=#{prefix}", "--with-zlib" system "make install" end end + +__END__ +diff --git a/src/nginx-module/config b/src/nginx-module/config +index a25a377..7eafdf7 100644 +--- a/src/nginx-module/config ++++ b/src/nginx-module/config +@@ -6,7 +6,7 @@ groonga_strip_switch() + + if [ "$GROONGA_HTTPD_IN_TREE" = yes ]; then + groonga_cflags="${GROONGA_HTTPD_CFLAGS} -I ${GROONGA_HTTPD_IN_TREE_INCLUDE_PATH}" +- groonga_libs="-L ${GROONGA_HTTPD_IN_TREE_LINK_PATH} ${GROONGA_HTTPD_LIBS} -Wl,-rpath=${GROONGA_HTTPD_RPATH}" ++ groonga_libs="-L${GROONGA_HTTPD_IN_TREE_LINK_PATH} ${GROONGA_HTTPD_LIBS} -Wl,-rpath -Wl,${GROONGA_HTTPD_RPATH}" + + ngx_addon_name=ngx_http_groonga_module + HTTP_MODULES="$HTTP_MODULES ngx_http_groonga_module"