From 602c05f1dbf05f659fcccb9a3dea0de8c4f32ddc Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Mon, 10 Jan 2011 22:38:21 +0000 Subject: [PATCH] we don't use Berkeley DB. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42181 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/software-profiles/python-2.4.cfg | 5 ++--- buildout/software-profiles/python-2.6.cfg | 5 ++--- buildout/software-profiles/python-2.7.cfg | 5 ++--- buildout/tests/assertSoftware.py | 14 -------------- 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/buildout/software-profiles/python-2.4.cfg b/buildout/software-profiles/python-2.4.cfg index 6153c7b365..9f8fec385a 100644 --- a/buildout/software-profiles/python-2.4.cfg +++ b/buildout/software-profiles/python-2.4.cfg @@ -3,7 +3,6 @@ extends = ../software-profiles/bzip2.cfg ../software-profiles/gdbm.cfg ../software-profiles/gettext.cfg - ../software-profiles/libdb.cfg ../software-profiles/ncurses.cfg ../software-profiles/openssl.cfg ../software-profiles/readline.cfg @@ -44,8 +43,8 @@ configure-options = --with-threads environment = - CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${libdb:location}/include -I${gettext:location}/include - LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -L${libdb:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -Wl,-rpath -Wl,${libdb:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib + CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include + LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib [pythonbin2.4] # XXX/Note: This is hackish way to have fully featured python interpreter diff --git a/buildout/software-profiles/python-2.6.cfg b/buildout/software-profiles/python-2.6.cfg index 36950d84a7..92d749142e 100644 --- a/buildout/software-profiles/python-2.6.cfg +++ b/buildout/software-profiles/python-2.6.cfg @@ -3,7 +3,6 @@ extends = ../software-profiles/bzip2.cfg ../software-profiles/gdbm.cfg ../software-profiles/gettext.cfg - ../software-profiles/libdb.cfg ../software-profiles/ncurses.cfg ../software-profiles/openssl.cfg ../software-profiles/readline.cfg @@ -32,8 +31,8 @@ configure-options = --with-threads environment = - CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${libdb:location}/include -I${gettext:location}/include - LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -L${libdb:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -Wl,-rpath -Wl,${libdb:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib + CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include + LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib [bootstrap2.6] <= bootstrap diff --git a/buildout/software-profiles/python-2.7.cfg b/buildout/software-profiles/python-2.7.cfg index 1c1dcc15ec..c7c8466d17 100644 --- a/buildout/software-profiles/python-2.7.cfg +++ b/buildout/software-profiles/python-2.7.cfg @@ -2,7 +2,6 @@ extends = ../software-profiles/bzip2.cfg ../software-profiles/gdbm.cfg - ../software-profiles/libdb.cfg ../software-profiles/ncurses.cfg ../software-profiles/openssl.cfg ../software-profiles/readline.cfg @@ -49,7 +48,7 @@ configure-options = --with-threads environment = - CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${libdb:location}/include - LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -L${libdb:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -Wl,-rpath -Wl,${libdb:location}/lib + CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include + LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py index 08de92ee2d..5da07f9b3e 100644 --- a/buildout/tests/assertSoftware.py +++ b/buildout/tests/assertSoftware.py @@ -2218,19 +2218,12 @@ if python_version >= '2.6': 'bzip2', 'gdbm', 'gettext', - 'libdb', 'ncurses', 'openssl', 'readline', 'sqlite3', 'zlib', ] - def test_ld_dyn_bsddb(self): - self.assertLibraryList(self.python_path+'/lib/python%s/lib-dynload/_bsddb.so' % python_version, [ - 'libc', - 'libdb-4.5', - 'libpthread', - ], self.rpath_list) def test_ld_dyn_dbm(self): self.assertLibraryList(self.python_path+'/lib/python%s/lib-dynload/dbm.so' % python_version, [ 'libc', @@ -2330,19 +2323,12 @@ elif python_version == '2.4': 'bzip2', 'gdbm', 'gettext', - 'libdb', 'ncurses', 'openssl', 'readline', 'sqlite3', 'zlib', ] - def test_ld_dyn_bsddb(self): - self.assertLibraryList(self.python_path+'/lib/python%s/lib-dynload/_bsddb.so' % python_version, [ - 'libc', - 'libdb-4.5', - 'libpthread', - ], self.rpath_list) def test_ld_dyn_dbm(self): self.assertLibraryList(self.python_path+'/lib/python%s/lib-dynload/dbm.so' % python_version, [ 'libc', -- 2.30.9