mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Slight reordering of directories searched for BerkDB libs and include files.

Browse source 
Push /usr/... further down the list - always check /usr/local/... before
/usr/...

Doubt this will help with http://python.org/sf/589427 or not, but these
changes were prompted by my investigation of that bug report.  I wasn't able
to reproduce that problem though
This commit is contained in:
Skip Montanaro 2002-08-15 01:34:38 +00:00
parent 8c91337221
commit ccfdde86eb
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
setup.py
View file

@ -442,6 +442,7 @@ class PyBuildExt(build_ext):
'/usr/local/BerkeleyDB.4.2/lib', '/usr/local/BerkeleyDB.4.2/lib',
'/usr/local/BerkeleyDB.4.1/lib', '/usr/local/BerkeleyDB.4.1/lib',
'/usr/local/BerkeleyDB.4.0/lib', '/usr/local/BerkeleyDB.4.0/lib',
'/usr/local/lib',
'/usr/lib', '/usr/lib',
'/opt/sfw', '/opt/sfw',
'/sw/lib', '/sw/lib',
@ -451,10 +452,10 @@ class PyBuildExt(build_ext):
'/usr/local/BerkeleyDB.4.2/include', '/usr/local/BerkeleyDB.4.2/include',
'/usr/local/BerkeleyDB.4.1/include', '/usr/local/BerkeleyDB.4.1/include',
'/usr/local/BerkeleyDB.4.0/include', '/usr/local/BerkeleyDB.4.0/include',
'/usr/include/db3', '/usr/local/include/db3',
'/opt/sfw/include/db3', '/opt/sfw/include/db3',
'/sw/include/db3', '/sw/include/db3',
'/usr/local/include/db3', '/usr/include/db3',
), ),
'incs': ('db_185.h',)}, 'incs': ('db_185.h',)},
'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db-3.0'), 'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db-3.0'),
@ -462,34 +463,44 @@ class PyBuildExt(build_ext):
'/usr/local/BerkeleyDB.3.2/lib', '/usr/local/BerkeleyDB.3.2/lib',
'/usr/local/BerkeleyDB.3.1/lib', '/usr/local/BerkeleyDB.3.1/lib',
'/usr/local/BerkeleyDB.3.0/lib', '/usr/local/BerkeleyDB.3.0/lib',
'/usr/lib', '/usr/local/lib',
'/opt/sfw', '/opt/sfw',
'/sw/lib', '/sw/lib',
'/usr/lib',
'/lib', '/lib',
), ),
'incdirs': ('/usr/local/BerkeleyDB.3.3/include', 'incdirs': ('/usr/local/BerkeleyDB.3.3/include',
'/usr/local/BerkeleyDB.3.2/include', '/usr/local/BerkeleyDB.3.2/include',
'/usr/local/BerkeleyDB.3.1/include', '/usr/local/BerkeleyDB.3.1/include',
'/usr/local/BerkeleyDB.3.0/include', '/usr/local/BerkeleyDB.3.0/include',
'/usr/include/db3', '/usr/local/include/db3',
'/opt/sfw/include/db3', '/opt/sfw/include/db3',
'/sw/include/db3', '/sw/include/db3',
'/usr/local/include/db3', '/usr/include/db3',
), ),
'incs': ('db_185.h',)}, 'incs': ('db_185.h',)},
'db2': {'libs': ('db2',), 'db2': {'libs': ('db2',),
'libdirs': ('/usr/lib', '/sw/lib', '/lib'), 'libdirs': ('/usr/local/lib',
'incdirs': ('/usr/include/db2', '/sw/lib',
'/usr/local/include/db2', '/sw/include/db2'), '/usr/lib',
'/lib'),
'incdirs': ('/usr/local/include/db2',
'/sw/include/db2',
'/usr/include/db2'),
'incs': ('db_185.h',)}, 'incs': ('db_185.h',)},
# if you are willing to risk hash db file corruption you can # if you are willing to risk hash db file corruption you can
# uncomment the lines below for db1. Note that this will affect # uncomment the lines below for db1. Note that this will affect
# not only the bsddb module, but the dbhash and anydbm modules # not only the bsddb module, but the dbhash and anydbm modules
# as well. you have been warned!!! # as well. YOU HAVE BEEN WARNED!!!
##'db1': {'libs': ('db1', 'db'), ##'db1': {'libs': ('db1', 'db'),
## 'libdirs': ('/usr/lib', '/sw/lib', '/lib'), ## 'libdirs': ('/usr/local/lib',
## 'incdirs': ('/usr/include/db1', '/usr/local/include/db1', ## '/sw/lib',
## '/usr/include', '/usr/local/include'), ## '/usr/lib',
## '/lib'),
## 'incdirs': ('/usr/local/include/db1',
## '/usr/local/include',
## '/usr/include/db1',
## '/usr/include'),
## 'incs': ('db.h',)}, ## 'incs': ('db.h',)},
} }