Kouhei Sutou
null+****@clear*****
Mon Aug 18 11:43:24 JST 2014
Kouhei Sutou 2014-08-18 11:43:24 +0900 (Mon, 18 Aug 2014) New Revision: b080cde0423cadf0c65713466a3358096b0b5c8f https://github.com/groonga/groonga/commit/b080cde0423cadf0c65713466a3358096b0b5c8f Message: package windows: use msgpack 0.5.9 Removed files: packages/windows/patches/msgpack-0.5.7-mingw-w64.diff Modified files: packages/windows/Rakefile Modified: packages/windows/Rakefile (+5 -8) =================================================================== --- packages/windows/Rakefile 2014-08-17 12:50:58 +0900 (01b050f) +++ packages/windows/Rakefile 2014-08-18 11:43:24 +0900 (5647cca) @@ -37,9 +37,6 @@ patches_dir = (base_dir + "patches").expand_path mecab_patches = [ "mecab-0.98-not-use-locale-on-mingw.diff", ] -msgpack_patches = [ - "msgpack-0.5.7-mingw-w64.diff", -] if groonga_win32_x86_p host = "i686-w64-mingw32" else @@ -56,10 +53,13 @@ namespace :build do rm_rf(tmp_dir) mkdir_p(tmp_dir) require 'open-uri' - msgpack_version = "0.5.7" + msgpack_version = "0.5.9" msgpack_base = "msgpack-#{msgpack_version}" msgpack_tar_gz = "#{msgpack_base}.tar.gz" - msgpack_tar_gz_url = "http://msgpack.org/releases/cpp/#{msgpack_tar_gz}" + msgpack_tar_gz_url_base = + "https://github.com/msgpack/msgpack-c/releases/download" + msgpack_tar_gz_url = + "#{msgpack_tar_gz_url_base}/cpp-#{msgpack_version}/#{msgpack_tar_gz}" Dir.chdir(tmp_dir) do msgpack_tar_gz = download_dir + msgpack_tar_gz unless msgpack_tar_gz.exist? @@ -73,9 +73,6 @@ namespace :build do sh("tar", "xzf", msgpack_tar_gz.to_s) or exit(false) end Dir.chdir(tmp_dir + msgpack_base) do - msgpack_patches.each do |patch| - sh("patch -p1 < #{patches_dir + patch}") - end sh("autoreconf", "--install", "--force") sh("./configure", "--prefix=#{binary_dir}", Deleted: packages/windows/patches/msgpack-0.5.7-mingw-w64.diff (+0 -21) 100644 =================================================================== --- packages/windows/patches/msgpack-0.5.7-mingw-w64.diff 2014-08-17 12:50:58 +0900 (5004ffe) +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru msgpack-0.5.7.orig/src/Makefile.am msgpack-0.5.7/src/Makefile.am ---- msgpack-0.5.7.orig/src/Makefile.am 2011-06-12 15:07:29.000000000 +0900 -+++ msgpack-0.5.7/src/Makefile.am 2012-02-27 14:40:02.265682155 +0900 -@@ -20,7 +20,7 @@ - - - # -version-info CURRENT:REVISION:AGE --libmsgpack_la_LDFLAGS = -version-info 3:0:0 -+libmsgpack_la_LDFLAGS = -version-info 3:0:0 -no-undefined - - - # backward compatibility -@@ -33,7 +33,7 @@ - vrefbuffer.c \ - zone.c - --libmsgpackc_la_LDFLAGS = -version-info 2:0:0 -+libmsgpackc_la_LDFLAGS = -version-info 2:0:0 -no-undefined - - - nobase_include_HEADERS = \ -------------- next part -------------- HTML����������������������������...Télécharger
