tag 639564 + patch
thanks
On Sun, Aug 28, 2011 at 11:04:32AM +0200, Philipp Kern wrote:
> Package: botan1.10
> Version: 1.10.0-2
> Severity: normal
> User: debian-s...@lists.debian.org
> Usertags: s390x
>
> As seen in the build log on [0], botan1.10 canonicalizes the CPU name s390x to
> s390/s390, and then tries to build with -m31. s390x is the 64bit variant of
> s390, hence the code should be compiled for 64bit with -m64 (or just by
> omitting the specification).
>
The problem is basically the same as for botan1.8, as in bug #638347.
The patch below fixes the problem for botan1.10.
diff -Nru botan1.10-1.10.0/debian/patches/botan1.10-1.10_s390x.patch
botan1.10-1.10.0/debian/patches/botan1.10-1.10_s390x.patch
--- botan1.10-1.10.0/debian/patches/botan1.10-1.10_s390x.patch 1970-01-01
01:00:00.000000000 +0100
+++ botan1.10-1.10.0/debian/patches/botan1.10-1.10_s390x.patch 2011-08-27
15:15:39.000000000 +0200
@@ -0,0 +1,17 @@
+--- botan1.10-1.10.0.orig/configure.py
++++ botan1.10-1.10.0/configure.py
+@@ -899,10 +899,10 @@ def canon_processor(archinfo, proc):
+ 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)
+
+ logging.debug('Known CPU names: ' + ' '.join(
+ sorted(sum([[ainfo.basename] + \
diff -Nru botan1.10-1.10.0/debian/patches/series
botan1.10-1.10.0/debian/patches/series
--- botan1.10-1.10.0/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ botan1.10-1.10.0/debian/patches/series 2011-08-27 15:17:10.000000000
+0200
@@ -0,0 +1 @@
+botan1.10-1.10_s390x.patch
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurel...@aurel32.net http://www.aurel32.net
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
