Le jeudi 30 mai 2013 à 14:46 +0100, Adam D. Barratt a écrit : > Control: tags -1 + pending > > On 2013-05-30 9:55, Sébastien Villemot wrote: > > Le lundi 27 mai 2013 à 21:18 +0100, Adam D. Barratt a écrit : > > > >> Please go ahead, using 0.1.1-6+deb7u1 as the version number. Any > >> reports > >> of successful tests on stable would be appreciated. > > > > Thanks, uploaded. > > Flagged for acceptance. Unfortunately the pu failed to build on powerpc. The cause is that the powerpc buildd now announces itself as "POWER7" arch, which is not recognized by openblas. I guess this change has to do with the buildd being upgraded to wheezy. I attach a new debdiff which should fix the issue. This patch is already applied upstream and in jessie/sid. It simply consists in treating POWER7 as if it were POWER6. I agree that having a build process depending the CPU type of the buildd is not ideal. This issue is not present for amd64/i386 were a general multi-CPUarch package is built. Unfortunately, upstream does not support (yet) that solution for powerpc. Cheers, -- .''`. Sébastien Villemot : :' : Debian Developer `. `' http://www.dynare.org/sebastien `- GPG Key: 4096R/381A7594
commit 2c7af7e1e66c767b7072b88eed12fcaec6493cba
Author: Sébastien Villemot <sebastien@debian.org>
Date: Mon May 20 17:42:51 2013 +0200
power7.patch: new patch, fixes FTBFS on powerpc machines with Power7 arch
diff --git a/debian/changelog b/debian/changelog
index 15e93b5..bc6bcdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openblas (0.1.1-6+deb7u2) stable; urgency=low
+
+ * power7.patch: new patch, fixes FTBFS on powerpc machines with Power7 arch
+
+ -- Sébastien Villemot <sebastien@debian.org> Tue, 04 Jun 2013 10:09:50 +0200
+
openblas (0.1.1-6+deb7u1) stable; urgency=low
* sgemv_uninitialized_buffer.diff: new patch taken from upstream, ensures that
diff --git a/debian/patches/power7.patch b/debian/patches/power7.patch
new file mode 100644
index 0000000..aabf4ba
--- /dev/null
+++ b/debian/patches/power7.patch
@@ -0,0 +1,19 @@
+Description: Make OpenBLAS compile on Power7 architecture
+ The workaround is to fallback on the Power6 arch on these machines. This seems
+ to work (did a small test on partch.debian.org).
+Author: Sébastien Villemot <sebastien@debian.org>
+Bug: https://github.com/xianyi/OpenBLAS/issues/220
+Applied-Upstream: https://github.com/xianyi/OpenBLAS/commit/109500178ca1b45ae1afb476daad75a1955f5fbe
+Last-Update: 2013-06-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/cpuid_power.c
++++ b/cpuid_power.c
+@@ -114,6 +114,7 @@
+ if (!strncasecmp(p, "PPC970", 6)) return CPUTYPE_PPC970;
+ if (!strncasecmp(p, "POWER5", 6)) return CPUTYPE_POWER5;
+ if (!strncasecmp(p, "POWER6", 6)) return CPUTYPE_POWER6;
++ if (!strncasecmp(p, "POWER7", 6)) return CPUTYPE_POWER6;
+ if (!strncasecmp(p, "Cell", 4)) return CPUTYPE_CELL;
+ if (!strncasecmp(p, "7447", 4)) return CPUTYPE_PPCG4;
+
diff --git a/debian/patches/series b/debian/patches/series
index 069ee2b..0fa8a38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ kill_threads_at_unload.diff
sgemv_uninitialized_buffer.diff
gemv_crash_big_data.diff
dot_uninitialized_buffer.diff
+power7.patch
Attachment:
signature.asc
Description: This is a digitally signed message part