Mercurial > gub

changeset 6198:a82f41987a16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert "tools::python: explicitly set flags for building dbm module" This reverts commit aa457a0bd04f15a53e35827b6478127171877030. The real fix is teaching setup.py about cross compilation.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 27 Aug 2012 15:46:33 +0200
parents 13f63473dac4
children d4129de94338
files gub/specs/python.py patches/python-2.4.5-Setup-dbm.patch
diffstat 2 files changed, 1 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/python.py	Mon Aug 27 12:16:16 2012 +0200
+++ b/gub/specs/python.py	Mon Aug 27 15:46:33 2012 +0200
@@ -182,7 +182,6 @@
         'python-2.4.5-regen.patch',
         'python-2.4.5-gcc-R.patch',
         'python-2.4.5-Setup-crypt.patch',
-        'python-2.4.5-Setup-dbm.patch',
         ]
     dependencies = [
         'autoconf',
@@ -191,6 +190,6 @@
         ]
     force_autoupdate = True
     parallel_build_broken = True
-    make_flags = Python.make_flags + ' LIBC="-lcrypt -ldb"'
+    make_flags = Python.make_flags + ' LIBC=-lcrypt'
     def patch (self):
         Python.patch (self)
--- a/patches/python-2.4.5-Setup-dbm.patch	Mon Aug 27 12:16:16 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- python-2.4.5/Modules/Setup.dist~	2012-08-26 17:54:57.188647513 +0200
-+++ python-2.4.5/Modules/Setup.dist	2012-08-26 18:10:03.592290524 +0200
-@@ -377,7 +377,7 @@
- #
- # First, look at Setup.config; configure may have set this for you.
- 
--#dbm dbmmodule.c 	# dbm(3) may require -lndbm or similar
-+dbm dbmmodule.c -DHAVE_BERKDB_H -DDB_DBM_HSEARCH -ldb	# dbm(3) may require -lndbm or similar
- 
- # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
- #