Kouhei Sutou
null+****@clear*****
Mon Aug 31 17:17:47 JST 2015
Kouhei Sutou 2015-08-31 17:17:47 +0900 (Mon, 31 Aug 2015) New Revision: 85b159bc09fd478fe9dffefbdc77d333748d3b53 https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53 Message: source windows: backport disabling WIN32_LEAN_AND_MEAN patch It causes build error on MariaDB bundled build on Windows. Added files: packages/source/patches/groonga-5.0.7-windows-mariadb-bundled-build.diff Modified files: packages/source/Makefile.am Modified: packages/source/Makefile.am (+3 -2) =================================================================== --- packages/source/Makefile.am 2015-08-31 16:50:15 +0900 (b364cbe) +++ packages/source/Makefile.am 2015-08-31 17:17:47 +0900 (0ee3e4c) @@ -103,8 +103,9 @@ files/$(MARIADB_WITH_MROONGA_BASE).tar.gz: tmp/$(MARIADB_WITH_MROONGA_BASE).stam mkdir -p files/ (cd tmp && tar czf ../$@ $(MARIADB_WITH_MROONGA_BASE)) -PATCHES = \ - patches/mariadb-10.0.3-windows-build.diff +PATCHES = \ + patches/mariadb-10.0.3-windows-build.diff \ + patches/groonga-5.0.7-windows-mariadb-bundled-build.diff tmp/$(MARIADB_WITH_MROONGA_FOR_WINDOWS_BASE).stamp: tmp/$(MARIADB_WITH_MROONGA_BASE).stamp $(PATCHES) rm -rf tmp/$(MARIADB_WITH_MROONGA_FOR_WINDOWS_BASE) Added: packages/source/patches/groonga-5.0.7-windows-mariadb-bundled-build.diff (+14 -0) 100644 =================================================================== --- /dev/null +++ packages/source/patches/groonga-5.0.7-windows-mariadb-bundled-build.diff 2015-08-31 17:17:47 +0900 (6e768b0) @@ -0,0 +1,14 @@ +diff -ru mariadb-10.0.21-with-mroonga-5.06.orig/storage/mroonga/vendor/groonga/lib/grn.h mariadb-10.0.21-with-mroonga-5.06/storage/mroonga/vendor/groonga/lib/grn.h +--- mariadb-10.0.21-with-mroonga-5.06.orig/storage/mroonga/vendor/groonga/lib/grn.h 2015-08-13 18:15:38.000000000 +0900 ++++ mariadb-10.0.21-with-mroonga-5.06/storage/mroonga/vendor/groonga/lib/grn.h 2015-08-31 17:13:59.251028024 +0900 +@@ -47,6 +47,10 @@ + # undef NTDDI_VERSION + # endif /* NTDDI_VERSION */ + # define NTDDI_VERSION GRN_MINIMUM_WINDOWS_VERSION ++ ++# ifdef WIN32_LEAN_AND_MEAN ++# undef WIN32_LEAN_AND_MEAN ++# endif /* WIN32_LEAN_AND_MEAN */ + #endif /* WIN32 */ + + #ifdef __cplusplus -------------- next part -------------- HTML����������������������������...다운로드
