Skip to content

erp5
erp5
Commit 602c05f1 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
Browse files
Options

we don't use Berkeley DB. 


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42181 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4be0af4a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 23 deletions
buildout/software-profiles/python-2.4.cfg
View file @ 602c05f1
...@@ -3,7 +3,6 @@ extends = ...@@ -3,7 +3,6 @@ extends =
../software-profiles/bzip2.cfg ../software-profiles/bzip2.cfg
../software-profiles/gdbm.cfg ../software-profiles/gdbm.cfg
../software-profiles/gettext.cfg ../software-profiles/gettext.cfg
../software-profiles/libdb.cfg
../software-profiles/ncurses.cfg ../software-profiles/ncurses.cfg
../software-profiles/openssl.cfg ../software-profiles/openssl.cfg
../software-profiles/readline.cfg ../software-profiles/readline.cfg
...@@ -44,8 +43,8 @@ configure-options = ...@@ -44,8 +43,8 @@ configure-options =
--with-threads --with-threads
environment = 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 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 -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 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] [pythonbin2.4]
# XXX/Note: This is hackish way to have fully featured python interpreter # XXX/Note: This is hackish way to have fully featured python interpreter
......
buildout/software-profiles/python-2.6.cfg
View file @ 602c05f1
...@@ -3,7 +3,6 @@ extends = ...@@ -3,7 +3,6 @@ extends =
../software-profiles/bzip2.cfg ../software-profiles/bzip2.cfg
../software-profiles/gdbm.cfg ../software-profiles/gdbm.cfg
../software-profiles/gettext.cfg ../software-profiles/gettext.cfg
../software-profiles/libdb.cfg
../software-profiles/ncurses.cfg ../software-profiles/ncurses.cfg
../software-profiles/openssl.cfg ../software-profiles/openssl.cfg
../software-profiles/readline.cfg ../software-profiles/readline.cfg
...@@ -32,8 +31,8 @@ configure-options = ...@@ -32,8 +31,8 @@ configure-options =
--with-threads --with-threads
environment = 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 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 -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 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] [bootstrap2.6]
<= bootstrap <= bootstrap
......
buildout/software-profiles/python-2.7.cfg
View file @ 602c05f1
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
extends = extends =
../software-profiles/bzip2.cfg ../software-profiles/bzip2.cfg
../software-profiles/gdbm.cfg ../software-profiles/gdbm.cfg
../software-profiles/libdb.cfg
../software-profiles/ncurses.cfg ../software-profiles/ncurses.cfg
../software-profiles/openssl.cfg ../software-profiles/openssl.cfg
../software-profiles/readline.cfg ../software-profiles/readline.cfg
...@@ -49,7 +48,7 @@ configure-options = ...@@ -49,7 +48,7 @@ configure-options =
--with-threads --with-threads
environment = 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 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 -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 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
buildout/tests/assertSoftware.py
View file @ 602c05f1
...@@ -2218,19 +2218,12 @@ if python_version >= '2.6': ...@@ -2218,19 +2218,12 @@ if python_version >= '2.6':
'bzip2', 'bzip2',
'gdbm', 'gdbm',
'gettext', 'gettext',
'libdb',
'ncurses', 'ncurses',
'openssl', 'openssl',
'readline', 'readline',
'sqlite3', 'sqlite3',
'zlib', '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): def test_ld_dyn_dbm(self):
self.assertLibraryList(self.python_path+'/lib/python%s/lib-dynload/dbm.so' % python_version, [ self.assertLibraryList(self.python_path+'/lib/python%s/lib-dynload/dbm.so' % python_version, [
'libc', 'libc',
...@@ -2330,19 +2323,12 @@ elif python_version == '2.4': ...@@ -2330,19 +2323,12 @@ elif python_version == '2.4':
'bzip2', 'bzip2',
'gdbm', 'gdbm',
'gettext', 'gettext',
'libdb',
'ncurses', 'ncurses',
'openssl', 'openssl',
'readline', 'readline',
'sqlite3', 'sqlite3',
'zlib', '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): def test_ld_dyn_dbm(self):
self.assertLibraryList(self.python_path+'/lib/python%s/lib-dynload/dbm.so' % python_version, [ self.assertLibraryList(self.python_path+'/lib/python%s/lib-dynload/dbm.so' % python_version, [
'libc', 'libc',
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7