From 25b98d44551ac9c87de64855f1b78ccb153c9482 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Tue, 9 Nov 2010 15:15:28 +0000 Subject: [PATCH] use our own readline library. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40115 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/software-profiles/mysql-5.1.cfg | 9 +++++---- buildout/software-profiles/mysql-tritonn-5.0.cfg | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/buildout/software-profiles/mysql-5.1.cfg b/buildout/software-profiles/mysql-5.1.cfg index 82eaefb536..e7fad84a06 100644 --- a/buildout/software-profiles/mysql-5.1.cfg +++ b/buildout/software-profiles/mysql-5.1.cfg @@ -8,6 +8,7 @@ extends = ../software-profiles/libtool.cfg ../software-profiles/ncurses.cfg ../software-profiles/openssl.cfg + ../software-profiles/readline.cfg parts = mysql-5.1 @@ -47,7 +48,7 @@ configure-options = --with-charset=utf8 --with-collation=utf8_unicode_ci --with-server-suffix=mysql-5.1 - --with-readline + --without-readline --with-ssl make-options = LIBTOOL=libtool @@ -59,6 +60,6 @@ patches = ${mysql-5.1-sphinx-patch:location}/${mysql-5.1-sphinx-patch:filename} environment = PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s - CFLAGS =-I${ncurses:location}/include - CXXFLAGS =-I${ncurses:location}/include - LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib + CFLAGS =-I${ncurses:location}/include -I${readline:location}/include + CXXFLAGS =-I${ncurses:location}/include -I${readline:location}/include + LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${readline:location}/lib diff --git a/buildout/software-profiles/mysql-tritonn-5.0.cfg b/buildout/software-profiles/mysql-tritonn-5.0.cfg index 3254a349e4..b3584c8640 100644 --- a/buildout/software-profiles/mysql-tritonn-5.0.cfg +++ b/buildout/software-profiles/mysql-tritonn-5.0.cfg @@ -12,6 +12,7 @@ extends = ../software-profiles/libtool.cfg ../software-profiles/ncurses.cfg ../software-profiles/openssl.cfg + ../software-profiles/readline.cfg parts = mysql-tritonn-5.0 @@ -63,7 +64,7 @@ configure-options = --with-server-suffix=mysql-tritonn-5.0 --with-mysqlmanager --enable-assembler - --with-readline + --without-readline --with-sphinx-storage-engine --with-named-curses-libs=${ncurses:location}/lib/libncurses.so --with-zlib-dir=${zlib:location} @@ -80,6 +81,6 @@ patches = ${mysql-5.0-sphinx-patch:location}/${mysql-5.0-sphinx-patch:filename} environment = PATH =${senna:location}/bin:${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s - CFLAGS =-I${senna:location}/include/senna -I${ncurses:location}/include - CXXFLAGS =-I${senna:location}/include/senna - LDFLAGS =-L${senna:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib + CFLAGS =-I${senna:location}/include/senna -I${ncurses:location}/include -I${readline:location}/include + CXXFLAGS =-I${senna:location}/include/senna -I${ncurses:location}/include -I${readline:location}/include + LDFLAGS =-L${senna:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -- 2.30.9