Commit 8d252a47 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

* use newer mysql-tritonn-hooks.py.

* specify LIBTOOL location in make-options ('libtool' is enough because we explicitly set PATH environment variable).


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40091 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 1c704f07
...@@ -40,9 +40,9 @@ download-only = true ...@@ -40,9 +40,9 @@ download-only = true
[mysql-tritonn-hooks-download] [mysql-tritonn-hooks-download]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = http://www.nexedi.org/static/buildout-hooks/mysql-tritonn-hooks.py-r36670 url = http://www.nexedi.org/static/buildout-hooks/mysql-tritonn-hooks.py-r40089
filename = mysql-tritonn-hooks.py filename = mysql-tritonn-hooks.py
md5sum = 484abb02375e354ef7be0438dc369f85 md5sum = b4d57a527fecaf7a8277fee3c3047bc4
download-only = true download-only = true
[mysql-tritonn-5.0] [mysql-tritonn-5.0]
...@@ -69,6 +69,7 @@ configure-options = ...@@ -69,6 +69,7 @@ configure-options =
--with-zlib-dir=${zlib:location} --with-zlib-dir=${zlib:location}
make-options = make-options =
LIBTOOL=libtool
LN_S='ln -s' LN_S='ln -s'
patch-options = -p1 patch-options = -p1
...@@ -79,5 +80,4 @@ environment = ...@@ -79,5 +80,4 @@ environment =
PATH =${senna:location}/bin:${autoconf-2.68:location}/bin:${automake-1.9:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s PATH =${senna:location}/bin:${autoconf-2.68:location}/bin:${automake-1.9:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
CFLAGS =-I${senna:location}/include/senna -I${ncurses:location}/include CFLAGS =-I${senna:location}/include/senna -I${ncurses:location}/include
CXXFLAGS =-I${senna:location}/include/senna CXXFLAGS =-I${senna:location}/include/senna
LIBTOOL =${libtool:location}/bin/libtool
LDFLAGS =-L${senna:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib LDFLAGS =-L${senna:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${ncurses:location}/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