Control: tags 960754 + pending
Dear maintainer,
I've prepared an NMU for wham-align (versioned as 0.1.5-3.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I should
cancel it.
cu
Adrian
diff -Nru wham-align-0.1.5/debian/changelog wham-align-0.1.5/debian/changelog
--- wham-align-0.1.5/debian/changelog 2020-06-18 02:31:17.000000000 +0300
+++ wham-align-0.1.5/debian/changelog 2020-07-05 18:45:54.000000000 +0300
@@ -1,3 +1,10 @@
+wham-align (0.1.5-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix the build on !x86. (Closes: #960754)
+
+ -- Adrian Bunk <b...@debian.org> Sun, 05 Jul 2020 18:45:54 +0300
+
wham-align (0.1.5-3) unstable; urgency=medium
* Team upload.
diff -Nru wham-align-0.1.5/debian/patches/non-x86.patch wham-align-0.1.5/debian/patches/non-x86.patch
--- wham-align-0.1.5/debian/patches/non-x86.patch 1970-01-01 02:00:00.000000000 +0200
+++ wham-align-0.1.5/debian/patches/non-x86.patch 2020-07-05 18:45:41.000000000 +0300
@@ -0,0 +1,39 @@
+Description: Fix FTBFS on !x86
+Author: Adrian Bunk <b...@debian.org>
+
+--- wham-align-0.1.5.orig/pair.h
++++ wham-align-0.1.5/pair.h
+@@ -831,6 +831,7 @@ bool pairAlignEnum(int64 * key, int64 *
+ return false;
+ }
+
++#if POPCNT
+ static inline int64 popcnt(int64 v)
+ {
+ int64 ret;
+@@ -841,6 +842,7 @@ bool pairAlignEnum(int64 * key, int64 *
+ #endif
+ return ret;
+ }
++#endif
+
+ static inline int64 BitCount(int64 x)
+ {
+--- wham-align-0.1.5.orig/perfcounters.cpp
++++ wham-align-0.1.5/perfcounters.cpp
+@@ -4,6 +4,8 @@
+
+ #include "perfcounters.h"
+
++#ifdef PERFCOUNT
++
+ #if defined(__sparc__)
+ #include <iostream>
+ using namespace std;
+@@ -80,4 +82,6 @@ void PerfCounters::threadinit() {
+ #else
+ #error Performance counters not known for this architecture.
+ #endif
+ }
++
++#endif
diff -Nru wham-align-0.1.5/debian/patches/series wham-align-0.1.5/debian/patches/series
--- wham-align-0.1.5/debian/patches/series 2020-06-18 02:31:17.000000000 +0300
+++ wham-align-0.1.5/debian/patches/series 2020-07-05 18:45:50.000000000 +0300
@@ -1 +1,2 @@
makefile.patch
+non-x86.patch
