Package: botan1.8
Version: 1.8.13-2
Severity: serious
Tags: patch
Justification: fails to build from source
User: debian-s...@lists.debian.org
Usertags: s390x

botan1.8 fails to build from source on s390x, as it detects this 
architecture as s390, and then passes -m31 to gcc to build it. 
This is due to the submodel matching code, which uses a regular 
expression to match aliases. Unfortunately s390x matches /s390/.

The patch below is a proposed way to fix that. It first look for
exact matches, and only then look for aliases with regular expressions.

Would it be possible to include this patch in the next upload of 
botan1.8? Thanks in advance.

diff -Nru botan1.8-1.8.13/debian/patches/botan1.8-1.8.13_s390x.patch 
botan1.8-1.8.13/debian/patches/botan1.8-1.8.13_s390x.patch
--- botan1.8-1.8.13/debian/patches/botan1.8-1.8.13_s390x.patch  1970-01-01 
00:00:00.000000000 +0000
+++ botan1.8-1.8.13/debian/patches/botan1.8-1.8.13_s390x.patch  2011-08-14 
10:38:37.000000000 +0000
@@ -0,0 +1,17 @@
+--- botan1.8-1.8.13.orig/configure.py
++++ botan1.8-1.8.13/configure.py
+@@ -577,10 +577,10 @@ class OsInfo(object):
+     for ainfo in archinfo.values():
+         if ainfo.basename == proc or proc in ainfo.aliases:
+             return (ainfo.basename, ainfo.basename)
+-        else:
+-            for (match,submodel) in ainfo.all_submodels():
+-                if re.search(match, proc) != None:
+-                    return (ainfo.basename, submodel)
++    for ainfo in archinfo.values():
++        for (match,submodel) in ainfo.all_submodels():
++            if re.search(match, proc) != None:
++                return (ainfo.basename, submodel)
+ 
+     raise Exception('Unknown or unidentifiable processor "%s"' % (proc))
+ 
diff -Nru botan1.8-1.8.13/debian/patches/series 
botan1.8-1.8.13/debian/patches/series
--- botan1.8-1.8.13/debian/patches/series       2011-07-11 12:45:39.000000000 
+0000
+++ botan1.8-1.8.13/debian/patches/series       2011-08-14 10:37:36.000000000 
+0000
@@ -1,3 +1,4 @@
 botan1.8-1.8.9_sh4.patch
 fix-spelling-error.patch
 link_to_libs_are_private.patch
+botan1.8-1.8.13_s390x.patch

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: s390x

Kernel: Linux 3.0.0-1-s390x (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to