summaryrefslogtreecommitdiff
path: root/lang/python26
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2010-02-11 21:09:50 +0000
committertnn <tnn@pkgsrc.org>2010-02-11 21:09:50 +0000
commit005f8460f0d66bf19adc5237841369e2b8d8ca7a (patch)
tree6f03c013bd01f87c8a995a645b2a008b830c65d9 /lang/python26
parent58250573bbcbf65d9b7fceb03a1ca730e232c636 (diff)
downloadpkgsrc-005f8460f0d66bf19adc5237841369e2b8d8ca7a.tar.gz
Try to deal with building dbm.so in case of BDB_TYPE=db4.
Tested on Linux.
Diffstat (limited to 'lang/python26')
-rw-r--r--lang/python26/distinfo4
-rw-r--r--lang/python26/patches/patch-am31
2 files changed, 23 insertions, 12 deletions
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index 28169493cde..1af6db76674 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2010/02/11 15:29:40 joerg Exp $
+$NetBSD: distinfo,v 1.20 2010/02/11 21:09:50 tnn Exp $
SHA1 (Python-2.6.4.tar.bz2) = bee572680d1966501247cb2b26e0e51f94d1cd13
RMD160 (Python-2.6.4.tar.bz2) = fd33853842110fa3636dd296f2f27646fd2b151a
@@ -10,7 +10,7 @@ SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b
SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b
SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa
SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e
-SHA1 (patch-am) = d098417f48f99c036f85b52aaad049262d971e39
+SHA1 (patch-am) = 6ca7c1c2360e30807d06ecb62b794604d1ad951a
SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
SHA1 (patch-ap) = 39d81b01fa9e1b894be9ae0922881337bb4d17da
diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am
index 82a05eee132..121d25f2c81 100644
--- a/lang/python26/patches/patch-am
+++ b/lang/python26/patches/patch-am
@@ -1,18 +1,18 @@
-$NetBSD: patch-am,v 1.9 2010/02/11 15:29:41 joerg Exp $
+$NetBSD: patch-am,v 1.10 2010/02/11 21:09:50 tnn Exp $
Disabled modules for normal build:
bsdddb
curses
curses_panel
elementtree
-Those have separate packages.
+Those have separate packages.
Only check the BUILDLINK_DIR for libraries etc, do not pick up random
headers and libraries from the system.
Build the 1.85 compat module all the time against the BDB version of choice.
---- setup.py.orig 2009-09-20 12:37:33.000000000 +0200
+--- setup.py.orig 2009-10-08 09:48:32.000000000 +0000
+++ setup.py
@@ -17,7 +17,7 @@ from distutils.command.install import in
from distutils.command.install_lib import install_lib
@@ -226,7 +226,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
- exts.append(Extension('bsddb185', ['bsddbmodule.c']))
- else:
- missing.append('bsddb185')
-+ libraries = os.getenv("PY_BDB_TYPE", "")
++ libraries = os.getenv("PY_BDB_TYPE", "")
+ if libraries:
+ exts.append(Extension('bsddb185', ['bsddbmodule.c'],
+ libraries=["db"]))
@@ -236,22 +236,33 @@ Build the 1.85 compat module all the time against the BDB version of choice.
# The standard Unix dbm module:
if platform not in ['cygwin']:
-@@ -1036,14 +882,6 @@ class PyBuildExt(build_ext):
+@@ -1020,7 +866,7 @@ class PyBuildExt(build_ext):
+ exts.append( Extension('dbm', ['dbmmodule.c'],
+ define_macros=[('HAVE_NDBM_H',None)],
+ libraries = ndbm_libs ) )
+- elif self.compiler.find_library_file(lib_dirs, 'gdbm'):
++ elif 1==0 and self.compiler.find_library_file(lib_dirs, 'gdbm'):
+ gdbm_libs = ['gdbm']
+ if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
+ gdbm_libs.append('gdbm_compat')
+@@ -1036,14 +882,11 @@ class PyBuildExt(build_ext):
libraries = gdbm_libs ) )
else:
missing.append('dbm')
- elif db_incs is not None:
-- exts.append( Extension('dbm', ['dbmmodule.c'],
++ elif 1==1:
+ exts.append( Extension('dbm', ['dbmmodule.c'],
- library_dirs=dblib_dir,
- runtime_library_dirs=dblib_dir,
- include_dirs=db_incs,
-- define_macros=[('HAVE_BERKDB_H',None),
-- ('DB_DBM_HSEARCH',None)],
+ define_macros=[('HAVE_BERKDB_H',None),
+ ('DB_DBM_HSEARCH',None)],
- libraries=dblibs))
++ libraries=["db"]))
else:
missing.append('dbm')
-@@ -1300,6 +1138,14 @@ class PyBuildExt(build_ext):
+@@ -1300,6 +1143,14 @@ class PyBuildExt(build_ext):
)
libraries = []
@@ -266,7 +277,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
else: # Linux and other unices
macros = dict(
HAVE_SEM_OPEN=1,
-@@ -1900,9 +1746,9 @@ def main():
+@@ -1900,9 +1751,9 @@ def main():
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install