[Erp5-report] r42181 kazuhiko - in /erp5/trunk/buildout: software-profiles/ tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jan 10 23:38:21 CET 2011
Author: kazuhiko
Date: Mon Jan 10 23:38:21 2011
New Revision: 42181
URL: http://svn.erp5.org?rev=42181&view=rev
Log:
we don't use Berkeley DB.
Modified:
erp5/trunk/buildout/software-profiles/python-2.4.cfg
erp5/trunk/buildout/software-profiles/python-2.6.cfg
erp5/trunk/buildout/software-profiles/python-2.7.cfg
erp5/trunk/buildout/tests/assertSoftware.py
Modified: erp5/trunk/buildout/software-profiles/python-2.4.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/python-2.4.cfg?rev=42181&r1=42180&r2=42181&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/python-2.4.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/python-2.4.cfg [utf8] Mon Jan 10 23:38:21 2011
@@ -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
Modified: erp5/trunk/buildout/software-profiles/python-2.6.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/python-2.6.cfg?rev=42181&r1=42180&r2=42181&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/python-2.6.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/python-2.6.cfg [utf8] Mon Jan 10 23:38:21 2011
@@ -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
Modified: erp5/trunk/buildout/software-profiles/python-2.7.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/python-2.7.cfg?rev=42181&r1=42180&r2=42181&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/python-2.7.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/python-2.7.cfg [utf8] Mon Jan 10 23:38:21 2011
@@ -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
Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=42181&r1=42180&r2=42181&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Mon Jan 10 23:38:21 2011
@@ -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',
More information about the Erp5-report
mailing list