Commit 98aa5dad authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Squashed commit of the following:

commit d42a85e53c313984de1dbeb7ca8eb432a5286c3a
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 18 14:12:11 2012 +0200

    version up : Apache httpd 2.4.2.

commit bbbd38c26ba87cf2b0fd2c17414c99fa84d36dbc
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Fri Apr 13 12:41:47 2012 +0200

    version up : Python 2.7.3.

commit 09de24474197a0650f8b67003007d295efe532d9
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 11 18:09:08 2012 +0200

    follow the change of mariadb header location.

commit ba53784a3d34f75a2f49c63b6f78f15c2758e48b
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 11 18:06:10 2012 +0200

    add mroonga-2.01-mariadb-5.5.23.patch.

commit 165486e2ce57e7a13b92b8d407b3e019b6e8b4fb
Merge: afc2f29 783ed21b
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 11 17:24:16 2012 +0200

    Merge remote-tracking branch 'origin/erp5' into erp5-component

commit afc2f2905faf0af1b938c664fa75a45cfb7ae7d5
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 11 17:24:13 2012 +0200

    version up : MariaDB 5.5.23.

commit b49ffa1de1ee7c1833358a1c9b069eb82b50f5b0
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 11 17:20:27 2012 +0200

    version up : Python 2.6.8.

commit 3e36266d47faff6b6700f41fbd76caa0cf021bbe
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Thu Apr 5 22:02:58 2012 +0200

    clear pre-defined system glib header path, because it has higher priority than our own specified one.

commit 2b9d6b0036adf4564379ff74558fc00c4a475a75
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Thu Apr 5 14:44:56 2012 +0200

    sphinx_snippets function seems not exist in sphinx storage engine included in mariadb 5.5.

commit c83854cf65be83297287353ac5e5df4240460108
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Thu Apr 5 14:11:12 2012 +0200

    version up : LibreOffice 3.5.2.

commit 6d6becd3697a5905db36b4786909aa19fd370f44
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 4 13:33:17 2012 +0200

    build sphinx storage engine as a dynamic plugin instead of statically embed in mysqld.
parent fa1d0e3b
...@@ -30,10 +30,10 @@ md5sum = 52b31b33fb1aa16e65ddaefc76e41151 ...@@ -30,10 +30,10 @@ md5sum = 52b31b33fb1aa16e65ddaefc76e41151
recipe = hexagonit.recipe.cmmi recipe = hexagonit.recipe.cmmi
depends = depends =
${gdbm:version} ${gdbm:version}
version = 2.4.1 version = 2.4.2
revision = 1 revision = 1
url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
md5sum = 7d3001c7a26b985d17caa367a868f11c md5sum = 6bb12f726e22656f0ad2baf91f1f8329
configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_} configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
--disable-static --disable-static
......
...@@ -12,12 +12,12 @@ find-links = ...@@ -12,12 +12,12 @@ find-links =
[libreoffice-bin] [libreoffice-bin]
recipe = slapos.recipe.build recipe = slapos.recipe.build
# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64). # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
version = 3.5.1 version = 3.5.2
url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
# supported architectures md5sums # supported architectures md5sums
md5sum_x86 = ee46fdafb8361b8e131994508c2723b3 md5sum_x86 = 1c22c272fc779da584fbe1380442f71b
md5sum_x86-64 = ddda58719358e5c97ca5d1c118646574 md5sum_x86-64 = 8f1964c54fd4c768dbc6df42c87be528
# where office code can be found? # where office code can be found?
officedir = libreoffice3.5 officedir = libreoffice3.5
......
...@@ -25,10 +25,10 @@ download-only = true ...@@ -25,10 +25,10 @@ download-only = true
[mariadb] [mariadb]
recipe = hexagonit.recipe.cmmi recipe = hexagonit.recipe.cmmi
version = 5.5.22 version = 5.5.23
revision = 2 revision = 1
url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
md5sum = d7d3bedd56cede5a045cb3fadf6b344e md5sum = 7074fa091b3c1489f45a5ddf12cd5e6f
# compile directory is required to build mysql plugins. # compile directory is required to build mysql plugins.
keep-compile-dir = true keep-compile-dir = true
patch-options = -p0 patch-options = -p0
...@@ -48,7 +48,6 @@ configure-options = ...@@ -48,7 +48,6 @@ configure-options =
-DWITH_EMBEDDED_SERVER=0 -DWITH_EMBEDDED_SERVER=0
-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
-DWITHOUT_DAEMON_EXAMPLE=1 -DWITHOUT_DAEMON_EXAMPLE=1
-DWITH_SPHINX_STORAGE_ENGINE=1
-DCMAKE_C_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include" -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
-DCMAKE_CXX_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include" -DCMAKE_CXX_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
-DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
...@@ -58,6 +57,13 @@ environment = ...@@ -58,6 +57,13 @@ environment =
CMAKE_LIBRARY_PATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib CMAKE_LIBRARY_PATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
LDFLAGS=-L${libaio:location}/lib LDFLAGS=-L${libaio:location}/lib
[mroonga-2.01-mariadb-5.5.23.patch]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
md5sum = 1ddf09d7abcb58e0a7c358f88e23415a
filename = ${:_buildout_section_name_}
download-only = true
[mroonga-mariadb] [mroonga-mariadb]
recipe = hexagonit.recipe.cmmi recipe = hexagonit.recipe.cmmi
url = https://github.com/downloads/mroonga/mroonga/mroonga-2.01.tar.gz url = https://github.com/downloads/mroonga/mroonga/mroonga-2.01.tar.gz
...@@ -65,6 +71,9 @@ md5sum = e1c4ba8ac50aa3750b9acde147eeec4b ...@@ -65,6 +71,9 @@ md5sum = e1c4ba8ac50aa3750b9acde147eeec4b
configure-options = configure-options =
--with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version} --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
--with-mysql-config=${mariadb:location}/bin/mysql_config --with-mysql-config=${mariadb:location}/bin/mysql_config
patch-options = -p0
patches =
${mroonga-2.01-mariadb-5.5.23.patch:location}/${mroonga-2.01-mariadb-5.5.23.patch:filename}
depends = depends =
${mariadb:version} ${mariadb:version}
${mariadb:revision} ${mariadb:revision}
......
--- ha_mroonga.cc.orig 2012-04-11 17:59:24.171323133 +0200
+++ ha_mroonga.cc 2012-04-11 18:01:50.431325458 +0200
@@ -10319,10 +10319,11 @@
bool ha_mroonga::wrapper_auto_repair() const
{
bool res;
+ int ha_err = 0;
MRN_DBUG_ENTER_METHOD();
MRN_SET_WRAP_SHARE_KEY(share, table->s);
MRN_SET_WRAP_TABLE_KEY(this, table);
- res = wrap_handler->auto_repair();
+ res = wrap_handler->auto_repair(ha_err);
MRN_SET_BASE_SHARE_KEY(share, table->s);
MRN_SET_BASE_TABLE_KEY(this, table);
DBUG_RETURN(res);
@@ -10330,9 +10331,10 @@
bool ha_mroonga::storage_auto_repair() const
{
+ int ha_err = 0;
MRN_DBUG_ENTER_METHOD();
// XXX: success is valid variable name?
- bool success = handler::auto_repair();
+ bool success = handler::auto_repair(ha_err);
DBUG_RETURN(success);
}
...@@ -24,8 +24,8 @@ doc-dependency = ${mydumper-doc:eggs} ...@@ -24,8 +24,8 @@ doc-dependency = ${mydumper-doc:eggs}
mysqllib = ${mariadb:location}/lib mysqllib = ${mariadb:location}/lib
pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/ pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/ libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/
includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include/ includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include/mysql
cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include/ cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include/mysql
mydumper-patches = mydumper-patches =
${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1 ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1
slapos_promise = slapos_promise =
......
...@@ -31,12 +31,12 @@ depends = ...@@ -31,12 +31,12 @@ depends =
prefix = ${buildout:parts-directory}/${:_buildout_section_name_} prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
version = 2.6 version = 2.6
package_version = ${:version}.8 package_version = ${:version}.8
package_version_suffix = rc2 package_version_suffix =
executable = ${:prefix}/bin/python${:version} executable = ${:prefix}/bin/python${:version}
url = url =
http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.bz2 http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.bz2
md5sum = 85d08abe34a7015b99b220ca383253f8 md5sum = c6e0420a21d8b23dee8b0195c9b9a125
patch-options = -p1 patch-options = -p1
patches = patches =
${python-2.6.6-no_system_inc_dirs.patch:location}/${python-2.6.6-no_system_inc_dirs.patch:filename} ${python-2.6.6-no_system_inc_dirs.patch:location}/${python-2.6.6-no_system_inc_dirs.patch:filename}
......
...@@ -25,8 +25,8 @@ python = python2.7 ...@@ -25,8 +25,8 @@ python = python2.7
[python2.7] [python2.7]
recipe = hexagonit.recipe.cmmi recipe = hexagonit.recipe.cmmi
package_version = 2.7.3 package_version = 2.7.3
package_version_suffix = rc2 package_version_suffix =
md5sum = 67059e1bcaf19e19394d16b80637f75f md5sum = c57477edd6d18bd9eeca2f21add73919
depends = depends =
${gdbm:version} ${gdbm:version}
......
...@@ -24,7 +24,7 @@ url = http://sphinxsearch.com/files/sphinx-2.0.2-beta.tar.gz ...@@ -24,7 +24,7 @@ url = http://sphinxsearch.com/files/sphinx-2.0.2-beta.tar.gz
md5sum = fafe0f1a71d0ded32404c067eba7d0b3 md5sum = fafe0f1a71d0ded32404c067eba7d0b3
configure-options = configure-options =
--with-mysql --with-mysql
--with-mysql-includes=${mariadb:location}/include --with-mysql-includes=${mariadb:location}/include/mysql
--with-mysql-libs=${mariadb:location}/lib --with-mysql-libs=${mariadb:location}/lib
--with-libstemmer --with-libstemmer
--with-iconv --with-iconv
......
...@@ -2,4 +2,4 @@ USE mysql; ...@@ -2,4 +2,4 @@ USE mysql;
DROP FUNCTION IF EXISTS last_insert_grn_id; DROP FUNCTION IF EXISTS last_insert_grn_id;
CREATE FUNCTION last_insert_grn_id RETURNS INTEGER SONAME 'ha_mroonga.so'; CREATE FUNCTION last_insert_grn_id RETURNS INTEGER SONAME 'ha_mroonga.so';
DROP FUNCTION IF EXISTS sphinx_snippets; DROP FUNCTION IF EXISTS sphinx_snippets;
#CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'sphinx.so'; #CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'ha_sphinx.so';
...@@ -206,6 +206,7 @@ recipe = plone.recipe.command ...@@ -206,6 +206,7 @@ recipe = plone.recipe.command
# here, we unset PYTHONPATH to invoke different python than buildout one. # here, we unset PYTHONPATH to invoke different python than buildout one.
command = command =
cd ${itools-download:destination} && cd ${itools-download:destination} &&
sed -i -e 's,GLIB_INCLUDE_PATH = .*,GLIB_INCLUDE_PATH = [],' setup.py
PYTHONPATH= ${python2.6:executable} setup.py build_ext -L ${glib:location}/lib -I ${glib:location}/include/glib-2.0:${glib:location}/lib/glib-2.0/include -R ${glib:location}/lib && PYTHONPATH= ${python2.6:executable} setup.py build_ext -L ${glib:location}/lib -I ${glib:location}/include/glib-2.0:${glib:location}/lib/glib-2.0/include -R ${glib:location}/lib &&
PYTHONPATH= ${python2.6:executable} setup.py install_lib -d ${itools:lib} PYTHONPATH= ${python2.6:executable} setup.py install_lib -d ${itools:lib}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment