gnu: Python: bump to version 2.7.4.

* gnu/packages/python.scm: bump to version 2.7.4, remove references to
python-fix-dbm.patch.
* Makefile.am: remove references to python-fix-dbm.patch
* gnu/packages/patches/python-fix-dbm.patch: remove it.
This commit is contained in:
Cyril Roelandt 2013-04-15 22:02:47 +02:00
parent e967678ed1
commit 0160536dcb
3 changed files with 3 additions and 27 deletions

View File

@ -229,7 +229,6 @@ dist_patch_DATA = \
gnu/packages/patches/make-impure-dirs.patch \ gnu/packages/patches/make-impure-dirs.patch \
gnu/packages/patches/mcron-install.patch \ gnu/packages/patches/mcron-install.patch \
gnu/packages/patches/perl-no-sys-dirs.patch \ gnu/packages/patches/perl-no-sys-dirs.patch \
gnu/packages/patches/python-fix-dbm.patch \
gnu/packages/patches/procps-make-3.82.patch \ gnu/packages/patches/procps-make-3.82.patch \
gnu/packages/patches/qemu-multiple-smb-shares.patch \ gnu/packages/patches/qemu-multiple-smb-shares.patch \
gnu/packages/patches/readline-link-ncurses.patch \ gnu/packages/patches/readline-link-ncurses.patch \

View File

@ -1,20 +0,0 @@
This patch allows the dbm module to be built using the compatibility mode of
gdbm. It will not be needed any more with Python 2.7.4.
--- setup.py 2013-04-06 00:53:37.000000000 +0200
+++ setup.py.new 2013-04-06 19:55:05.000000000 +0200
@@ -1158,10 +1158,14 @@
for cand in dbm_order:
if cand == "ndbm":
if find_file("ndbm.h", inc_dirs, []) is not None:
- # Some systems have -lndbm, others don't
+ # Some systems have -lndbm, some have -lgdbm_compat,
+ # others have no particular linker flags.
if self.compiler.find_library_file(lib_dirs,
'ndbm'):
ndbm_libs = ['ndbm']
+ elif self.compiler.find_library_file(lib_dirs,
+ 'gdbm_compat'):
+ ndbm_libs = ['gdbm_compat']
else:
ndbm_libs = []
print "building dbm using ndbm"

View File

@ -31,7 +31,7 @@
(define-public python (define-public python
(package (package
(name "python") (name "python")
(version "2.7.3") (version "2.7.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -39,12 +39,10 @@
version "/Python-" version ".tar.xz")) version "/Python-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"11f9aw855lrmknr6c82gm1ijr3n0smc6idyp94y7774yivjnplv1")))) "0bdn4dylm92n2dsvqvjfyask9jbz88aan5hi4lgkawkxs2v6wqmn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; XXX: some tests fail `(#:tests? #f ; XXX: some tests fail
#:patches (list (assoc-ref %build-inputs "patch-dbm"))
#:patch-flags '("-p0")
#:configure-flags #:configure-flags
(let ((bz2 (assoc-ref %build-inputs "bzip2")) (let ((bz2 (assoc-ref %build-inputs "bzip2"))
(gdbm (assoc-ref %build-inputs "gdbm")) (gdbm (assoc-ref %build-inputs "gdbm"))
@ -68,8 +66,7 @@
("gdbm" ,gdbm) ("gdbm" ,gdbm)
("openssl" ,openssl) ("openssl" ,openssl)
("readline" ,readline) ("readline" ,readline)
("zlib" ,zlib) ("zlib" ,zlib)))
("patch-dbm" ,(search-patch "python-fix-dbm.patch"))))
(home-page "http://python.org") (home-page "http://python.org")
(synopsis (synopsis
"Python, a high-level dynamically-typed programming language") "Python, a high-level dynamically-typed programming language")