[Erp5-report] r41914 kazuhiko - in /erp5/trunk/buildout: profiles/ software-profiles/
nobody at svn.erp5.org
nobody at svn.erp5.org
Sat Jan 1 16:23:48 CET 2011
Author: kazuhiko
Date: Sat Jan 1 16:23:48 2011
New Revision: 41914
URL: http://svn.erp5.org?rev=41914&view=rev
Log:
use MariaDB-5.2 instead of MySQL-5.1.
Modified:
erp5/trunk/buildout/profiles/official-2.12.cfg
erp5/trunk/buildout/profiles/official.cfg
erp5/trunk/buildout/software-profiles/handlersocket.cfg
erp5/trunk/buildout/software-profiles/mroonga.cfg
erp5/trunk/buildout/software-profiles/sphinx.cfg
Modified: erp5/trunk/buildout/profiles/official-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official-2.12.cfg?rev=41914&r1=41913&r2=41914&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] Sat Jan 1 16:23:48 2011
@@ -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
Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=41914&r1=41913&r2=41914&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Sat Jan 1 16:23:48 2011
@@ -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
Modified: erp5/trunk/buildout/software-profiles/handlersocket.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/handlersocket.cfg?rev=41914&r1=41913&r2=41914&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/handlersocket.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/handlersocket.cfg [utf8] Sat Jan 1 16:23:48 2011
@@ -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
Modified: erp5/trunk/buildout/software-profiles/mroonga.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/mroonga.cfg?rev=41914&r1=41913&r2=41914&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/mroonga.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/mroonga.cfg [utf8] Sat Jan 1 16:23:48 2011
@@ -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
Modified: erp5/trunk/buildout/software-profiles/sphinx.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/sphinx.cfg?rev=41914&r1=41913&r2=41914&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/sphinx.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/sphinx.cfg [utf8] Sat Jan 1 16:23:48 2011
@@ -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/
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
More information about the Erp5-report
mailing list