Kouhei Sutou
null+****@clear*****
Mon Sep 28 11:04:29 JST 2015
Kouhei Sutou 2015-09-28 11:04:29 +0900 (Mon, 28 Sep 2015) New Revision: 05b2f9e4726172baefed0e167a1207331306d181 https://github.com/groonga/groonga/commit/05b2f9e4726172baefed0e167a1207331306d181 Message: windows: fix build error of nginx-1.9.5 on MinGW The patch should be reported to upstream. Added files: packages/windows/patches/nginx-1.9-5-fix-build-error.diff Modified files: packages/windows/Rakefile Modified: packages/windows/Rakefile (+9 -0) =================================================================== --- packages/windows/Rakefile 2015-09-28 10:26:34 +0900 (b6fa01f) +++ packages/windows/Rakefile 2015-09-28 11:04:29 +0900 (9f7de77) @@ -41,6 +41,9 @@ mecab_patches = [ "mecab-0.98-not-use-locale-on-mingw.diff", "mecab-0.98-add-missing-dll-export.diff", ] +nginx_patches = [ + "nginx-1.9-5-fix-build-error.diff", +] if groonga_win32_x86_p host = "i686-w64-mingw32" else @@ -251,6 +254,12 @@ namespace :build do sh("tar", "xzf", groonga_source.to_s) or exit(false) end Dir.chdir(tmp_dir + "groonga-#{groonga_version}") do + Dir.chdir("vendor") do + nginx_patches.each do |patch| + sh("patch -p0 < #{patches_dir + patch}") + end + end + mecab_config = binary_dir + "bin" + "mecab-config" options = [ "--prefix=#{binary_dir}", Added: packages/windows/patches/nginx-1.9-5-fix-build-error.diff (+12 -0) 100644 =================================================================== --- /dev/null +++ packages/windows/patches/nginx-1.9-5-fix-build-error.diff 2015-09-28 11:04:29 +0900 (ccb71c2) @@ -0,0 +1,12 @@ +diff -ru nginx-1.9.5.orig/src/core/ngx_connection.c nginx-1.9.5/src/core/ngx_connection.c +--- nginx-1.9.5.orig/src/core/ngx_connection.c 2015-09-28 09:56:45.660075199 +0900 ++++ nginx-1.9.5/src/core/ngx_connection.c 2015-09-28 10:28:48.284449372 +0900 +@@ -1175,7 +1175,7 @@ + + /* THREAD: lock */ + +- if (c[i].fd != -1 && c[i].idle) { ++ if (c[i].fd != (ngx_socket_t) -1 && c[i].idle) { + c[i].close = 1; + c[i].read->handler(c[i].read); + } -------------- next part -------------- HTML����������������������������...Download