use MariaDB-5.2 instead of MySQL-5.1.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41916 20353a03-c40f-0410-a6d1-a30d3c3de9de

buildout/profiles/official-2.12.cfg

@@ -23,7 +23,6 @@ extends =
   ../software-profiles/messagepack.cfg
   ../software-profiles/mroonga.cfg
   ../software-profiles/mysql-tritonn-5.0.cfg
-  ../software-profiles/mysql-5.1.cfg
   ../software-profiles/sphinx.cfg
   ../software-profiles/oood.cfg
   ../software-profiles/openoffice-bin.cfg
@@ -49,7 +48,7 @@ parts =
   xpdf
   ghostscript
   mysql-tritonn-5.0
-  mysql-5.1
+  mariadb
   mroonga
   sphinx
   imagemagick

buildout/profiles/official.cfg

@@ -18,11 +18,11 @@ extends =
   ../software-profiles/ghostscript.cfg
   ../software-profiles/libevent.cfg
   ../software-profiles/libtool.cfg
+  ../software-profiles/mariadb.cfg
   ../software-profiles/memcached.cfg
   ../software-profiles/messagepack.cfg
   ../software-profiles/mroonga.cfg
   ../software-profiles/mysql-tritonn-5.0.cfg
-  ../software-profiles/mysql-5.1.cfg
   ../software-profiles/sphinx.cfg
   ../software-profiles/oood.cfg
   ../software-profiles/openoffice-bin.cfg
@@ -49,7 +49,7 @@ parts =
   xpdf
   ghostscript
   mysql-tritonn-5.0
-  mysql-5.1
+  mariadb
   mroonga
   sphinx
   imagemagick

buildout/software-profiles/handlersocket.cfg

@@ -6,7 +6,7 @@ extends =
   ../software-profiles/autoconf.cfg
   ../software-profiles/automake.cfg
   ../software-profiles/libtool.cfg
-  ../software-profiles/mysql-5.1.cfg
+  ../software-profiles/mariadb.cfg
 
 parts =
   handlersocket
@@ -19,8 +19,8 @@ configure-command =
   ACLOCAL_ARGS=-I${libtool:location}/share/aclocal ./autogen.sh && ./configure
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --with-mysql-source=${mysql-5.1:location}__compile__/mysql-${mysql-5.1:version}
-  --with-mysql-bindir=${mysql-5.1:location}/bin
-  --with-mysql-plugindir=${mysql-5.1:location}/lib/mysql/plugin
+  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
+  --with-mysql-bindir=${mariadb:location}/bin
+  --with-mysql-plugindir=${mariadb:location}/lib/mysql/plugin
 environment =
   PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:%(PATH)s

buildout/software-profiles/mroonga.cfg

@@ -6,25 +6,35 @@
 parts =
   mroonga
 extends =
-  ../software-profiles/mysql-5.1.cfg
+  ../software-profiles/mariadb.cfg
   ../software-profiles/pkgconfig.cfg
 
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://groonga.org/files/groonga/groonga-1.0.4.tar.gz
-md5sum = b770f5917f6d9e7ceea53087c637a064
+url = http://groonga.org/files/groonga/groonga-1.0.6.tar.gz
+md5sum = a278e72801a68acf374cbc309d73ba34
 configure-options =
   --without-mecab
 
+[mroonga-mariadb-patch]
+recipe = hexagonit.recipe.download
+url = http://www.nexedi.org/static/patches/${:filename}
+md5sum = da2457b9f8006cddb279a165128479e5
+filename = groonga-storage-engine-0.4.mariadb.patch
+download-only = true
+
 [mroonga]
 recipe = hexagonit.recipe.cmmi
-url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-0.3.tar.gz
-md5sum = a9d369f9e1f3d3c5b0f118e2a4490585
+url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-0.4.tar.gz
+md5sum = eb39ddaebb5a295f103bb1f66d5b33da
+patch-options = -p1
+patches =
+  ${mroonga-mariadb-patch:location}/${mroonga-mariadb-patch:filename}
 configure-options =
-  --with-mysql-source=${mysql-5.1:location}__compile__/mysql-${mysql-5.1:version}
-  --with-mysql-config=${mysql-5.1:location}/bin/mysql_config
+  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
+  --with-mysql-config=${mariadb:location}/bin/mysql_config
 environment =
-    PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-    CPPFLAGS=-I${groonga:location}/include/groonga
-    LDFLAGS=-L${groonga:location}/lib
-    PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
+  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  CPPFLAGS=-I${groonga:location}/include/groonga
+  LDFLAGS=-L${groonga:location}/lib
+  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig

buildout/software-profiles/sphinx.cfg

@@ -2,7 +2,7 @@
 parts = sphinx
 extends =
   ../software-profiles/libexpat.cfg
-  ../software-profiles/mysql-5.1.cfg
+  ../software-profiles/mariadb.cfg
   ../software-profiles/zlib.cfg
 
 [sphinx-1.10-fix_nosigpipe.patch]
@@ -26,8 +26,8 @@ url = http://www.sphinxsearch.com/files/sphinx-1.10-beta.tar.gz
 md5sum = 5b52ce9e93a73c66d37bc3a2402f14fa
 configure-options =
   --with-mysql
-  --with-mysql-includes=${mysql-5.1:location}/include/mysql
-  --with-mysql-libs=${mysql-5.1:location}/lib/mysql
+  --with-mysql-includes=${mariadb:location}/include/mysql
+  --with-mysql-libs=${mariadb:location}/lib/mysql
   --with-libstemmer
   --with-iconv
   --without-pgsql
@@ -38,4 +38,4 @@ patches =
   ${sphinx-1.10-beta-snowball.patch:location}/${sphinx-1.10-beta-snowball.patch:filename}
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${libexpat:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath ${mysql-5.1:location}/lib/mysql -L${libexpat:location}/lib -Wl,-rpath ${libexpat:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath ${mariadb:location}/lib/mysql -L${libexpat:location}/lib -Wl,-rpath ${libexpat:location}/lib

buildout/tests/assertSoftware.py

@@ -85,7 +85,7 @@ ACCEPTABLE_GLOBAL_LIB_LIST = (
 
 SKIP_PART_LIST = (
   'parts/boost-lib-download',
-  'parts/mysql-5.1__compile__',
+  'parts/mariadb__compile__',
   'parts/openoffice-bin',
   'parts/openoffice-bin__unpack__',
 )
@@ -392,39 +392,39 @@ class AssertMysql50Tritonn(AssertSoftwareMixin):
       'libmysqlclient', 'libnsl', 'libssl', 'libz'], ['ncurses', 'zlib', 'readline', 'openssl'], [os.path.join(os.path.abspath(os.curdir),
       'parts', 'mysql-tritonn-5.0', 'lib', 'mysql')])
 
-class AssertMysql51(AssertSoftwareMixin):
+class AssertMariadb(AssertSoftwareMixin):
   def test_ld_mysqld(self):
-    self.assertLibraryList('parts/mysql-5.1/libexec/mysqld', ['libc', 'libcrypt', 'libdl', 'libgcc_s', 'libm', 'libnsl',
-      'libpthread', 'libstdc++', 'libz'], ['ncurses', 'zlib', 'readline'])
+    self.assertLibraryList('parts/mariadb/libexec/mysqld', ['libc', 'libcrypt', 'libdl', 'libgcc_s', 'libm', 'libnsl',
+      'libpthread', 'librt', 'libstdc++', 'libz'], ['ncurses', 'zlib', 'readline'])
 
   def test_ld_mysqlmanager(self):
-    self.assertLibraryList('parts/mysql-5.1/libexec/mysqlmanager', ['libc', 'libcrypt', 'libgcc_s', 'libm', 'libnsl',
-      'libpthread', 'libstdc++', 'libz'], ['ncurses', 'zlib', 'readline'])
+    self.assertLibraryList('parts/mariadb/libexec/mysqlmanager', ['libc', 'libcrypt', 'libdl', 'libgcc_s', 'libm', 'libnsl',
+      'libpthread', 'librt', 'libstdc++', 'libz'], ['ncurses', 'zlib', 'readline'])
 
   def test_ld_libmysqlclient_r(self):
-    self.assertLibraryList('parts/mysql-5.1/lib/mysql/libmysqlclient_r.so', ['libc', 'libz', 'libcrypt', 'libm', 'libnsl', 'libpthread'], ['ncurses', 'zlib', 'readline'])
+    self.assertLibraryList('parts/mariadb/lib/mysql/libmysqlclient_r.so', ['libc', 'libdl', 'librt', 'libz', 'libcrypt', 'libm', 'libnsl', 'libpthread'], ['ncurses', 'zlib', 'readline'])
 
   def test_ld_libmysqlclient(self):
-    self.assertLibraryList('parts/mysql-5.1/lib/mysql/libmysqlclient.so', ['libc', 'libz', 'libcrypt', 'libm', 'libnsl', 'libpthread'], ['ncurses', 'readline', 'zlib'])
+    self.assertLibraryList('parts/mariadb/lib/mysql/libmysqlclient.so', ['libc', 'libdl', 'librt', 'libz', 'libcrypt', 'libm', 'libnsl', 'libpthread'], ['ncurses', 'readline', 'zlib'])
 
   def test_ld_mysql(self):
-    self.assertLibraryList('parts/mysql-5.1/bin/mysql', ['libc', 'libz', 'libcrypt', 'libgcc_s', 'libm',
+    self.assertLibraryList('parts/mariadb/bin/mysql', ['libc', 'libdl', 'librt', 'libz', 'libcrypt', 'libgcc_s', 'libm',
       'libmysqlclient', 'libncursesw', 'libnsl', 'libpthread', 'libreadline',
       'libstdc++'], ['ncurses', 'zlib', 'readline'],
                            [os.path.join(os.path.abspath(os.curdir),
-      'parts', 'mysql-5.1', 'lib', 'mysql')])
+      'parts', 'mariadb', 'lib', 'mysql')])
 
   def test_ld_mysqladmin(self):
-    self.assertLibraryList('parts/mysql-5.1/bin/mysqladmin', ['libc', 'libz', 'libcrypt', 'libgcc_s', 'libm',
+    self.assertLibraryList('parts/mariadb/bin/mysqladmin', ['libc', 'libdl', 'librt', 'libz', 'libcrypt', 'libgcc_s', 'libm',
       'libmysqlclient', 'libnsl', 'libpthread', 'libstdc++'], ['ncurses', 'zlib', 'readline'],
                            [os.path.join(os.path.abspath(os.curdir),
-      'parts', 'mysql-5.1', 'lib', 'mysql')])
+      'parts', 'mariadb', 'lib', 'mysql')])
 
   def test_ld_mysqldump(self):
-    self.assertLibraryList('parts/mysql-5.1/bin/mysqldump', ['libc', 'libz', 'libcrypt', 'libm', 'libmysqlclient',
+    self.assertLibraryList('parts/mariadb/bin/mysqldump', ['libc', 'libdl', 'librt', 'libz', 'libcrypt', 'libm', 'libmysqlclient',
       'libnsl', 'libpthread'], ['ncurses', 'zlib', 'readline'],
                            [os.path.join(os.path.abspath(os.curdir),
-      'parts', 'mysql-5.1', 'lib', 'mysql')])
+      'parts', 'mariadb', 'lib', 'mysql')])
 
 class AssertSqlite3(AssertSoftwareMixin):
   """Tests for built memcached"""
@@ -1851,7 +1851,7 @@ class AssertSphinx(AssertSoftwareMixin):
       'zlib'
       ]
   core_additional_rpath_list = [
-      os.path.join(os.path.abspath(os.curdir), 'parts', 'mysql-5.1', 'lib', 'mysql')
+      os.path.join(os.path.abspath(os.curdir), 'parts', 'mariadb', 'lib', 'mysql')
       ]
 
   def test_ld_sphinx(self):