Navigation Menu

Skip to content

Commit

Permalink
source windows: backport disabling WIN32_LEAN_AND_MEAN patch
Browse files Browse the repository at this point in the history
It causes build error on MariaDB bundled build on Windows.
  • Loading branch information
kou committed Aug 31, 2015
1 parent 2f0e7f1 commit 85b159b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
5 changes: 3 additions & 2 deletions packages/source/Makefile.am
Expand Up @@ -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)
Expand Down
@@ -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

0 comments on commit 85b159b

Please sign in to comment.