[gentoo-commits] gentoo-x86 commit in dev-libs/botan/files: botan-1.10-python3.patch

[gentoo-commits] gentoo-x86 commit in dev-libs/botan/files: botan-1.10-python3.patch

[Alon Bar-Lev (alonbl)]

alonbl      13/09/21 19:26:53

  Added:                botan-1.10-python3.patch
  Log:
  fix python3 issue, bug#485490, thanks to Martin von Gagern
  
  (Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

Revision  Changes    Path
1.1                  dev-libs/botan/files/botan-1.10-python3.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/botan/files/botan-1.10-python3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/botan/files/botan-1.10-python3.patch?rev=1.1&content-type=text/plain

Index: botan-1.10-python3.patch
===================================================================
Make configure script work for Python 3.

In Python 3, map returns an iterable, not a list, so for a subsequent map to
work we have to convert that to a list explicitely.  This should work for
Python 2 just as well, so the patch can be applied unconditionally.

2013-09-21 Martin von Gagern

References:
https://bugs.gentoo.org/485490

Index: Botan-1.10.5/configure.py
===================================================================
--- Botan-1.10.5.orig/configure.py
+++ Botan-1.10.5/configure.py
@@ -1780,7 +1780,7 @@ def main(argv = None):
                 gcc_version = stdout.strip()
 
                 logging.info('Detected gcc version %s' % (gcc_version))
-                return map(int, gcc_version.split('.')[0:2])
+                return [int(c) for c in gcc_version.split('.')[0:2]]
             except OSError:
                 logging.warning('Could not execute %s for version check' % (gcc_bin))
                 return None