diff options
| author | Wen Heping <wen@FreeBSD.org> | 2011-03-16 00:10:57 +0000 |
|---|---|---|
| committer | Wen Heping <wen@FreeBSD.org> | 2011-03-16 00:10:57 +0000 |
| commit | d963c7dca27074c6a097997a3dd79cdd9d1b2135 (patch) | |
| tree | f222144ad16fe087ef3164fc218ab72ed8f2badb /databases/py-bsddb3/files/patch-setup3.py | |
| parent | Move from USE_GCC=4.4+ to USE_GCC=4.5+ since the 4.5 is the canonical (diff) | |
- Update to 5.1.2
- Restore the patch to fix build with bsddb other than 4.2
Diffstat (limited to 'databases/py-bsddb3/files/patch-setup3.py')
| -rw-r--r-- | databases/py-bsddb3/files/patch-setup3.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/databases/py-bsddb3/files/patch-setup3.py b/databases/py-bsddb3/files/patch-setup3.py index 085acb026287..0ca781085917 100644 --- a/databases/py-bsddb3/files/patch-setup3.py +++ b/databases/py-bsddb3/files/patch-setup3.py @@ -1,13 +1,25 @@ ---- setup3.py.orig 2009-06-30 14:58:24.819924337 +0800 -+++ setup3.py 2009-06-30 14:59:39.207070800 +0800 -@@ -204,8 +204,8 @@ +--- setup3.py.orig 2011-03-15 16:10:41.000000000 +0800 ++++ setup3.py 2011-03-15 16:12:40.000000000 +0800 +@@ -53,10 +53,7 @@ + category=DeprecationWarning) + + +-try : +- from setuptools import setup, Extension +-except : +- from distutils.core import setup, Extension ++from distutils.core import setup, Extension + + from distutils.dep_util import newer + import distutils.ccompiler +@@ -247,8 +244,8 @@ incdir = os.path.join(BERKELEYDB_DIR, 'include') if not libdir: libdir = os.path.join(BERKELEYDB_DIR, 'lib') - if not '-ldb' in LIBS: - libname = [dblib] + if not '-l%%DBVERSION%%' in LIBS: -+ libname = ['%%DBVERSION%%'] ++ libname = [%%DBVERSION%%] else: if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'") libname = [] |