[Groonga-mysql-commit] mroonga/mroonga at ff11a42 [master] Update the patch for MariaDB to work with mroonga on Windows

Back to archive index

HAYASHI Kentaro null+****@clear*****
Thu Jul 25 14:04:54 JST 2013


HAYASHI Kentaro	2013-07-25 14:04:54 +0900 (Thu, 25 Jul 2013)

  New Revision: ff11a425aac99345f1d391ae5cba7d10ef22616c
  https://github.com/mroonga/mroonga/commit/ff11a425aac99345f1d391ae5cba7d10ef22616c

  Message:
    Update the patch for MariaDB to work with mroonga on Windows
    
    refs #1729
    
    No need to apply patch to MariaDB source except BOM issue.
    
    Here is the related commit.
    
      https://github.com/mroonga/mroonga/commit/ed74a731127b051b841b6c538ad49a9145b25cb7

  Added files:
    packages/source/patches/mariadb-10.0.3-windows-build.diff
  Modified files:
    packages/source/Makefile.am

  Modified: packages/source/Makefile.am (+1 -1)
===================================================================
--- packages/source/Makefile.am    2013-07-25 13:36:12 +0900 (4151d59)
+++ packages/source/Makefile.am    2013-07-25 14:04:54 +0900 (cee63cb)
@@ -101,7 +101,7 @@ files/$(MARIADB_WITH_MROONGA_BASE).tar.gz: tmp/$(MARIADB_WITH_MROONGA_BASE).stam
 	(cd tmp && tar czf ../$@ $(MARIADB_WITH_MROONGA_BASE))
 
 PATCHES =						\
-	patches/mariadb-10.0.2-windows-build.diff
+	patches/mariadb-10.0.3-windows-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/mariadb-10.0.3-windows-build.diff (+9 -0) 100644
===================================================================
--- /dev/null
+++ packages/source/patches/mariadb-10.0.3-windows-build.diff    2013-07-25 14:04:54 +0900 (c135088)
@@ -0,0 +1,9 @@
+diff -ur mariadb-10.0.2.orig/sql/sql_locale.cc mariadb-10.0.2/sql/sql_locale.cc
+--- mariadb-10.0.2.orig/sql/sql_locale.cc	2013-04-23 13:13:59.000000000 +0900
++++ mariadb-10.0.2/sql/sql_locale.cc	2013-05-19 12:55:27.590366542 +0900
+@@ -1,4 +1,4 @@
+-/* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
++/* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
-------------- next part --------------
HTML����������������������������...
Descargar 



More information about the Groonga-mysql-commit mailing list
Back to archive index