[Pkg-mongodb-maintainers] [pkg-mongodb] 01/02: Disable hardware-assisted CRC32 on arm64 and s390x

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch experimental
in repository pkg-mongodb.

commit 94bdf387303384b41f54fa5142d1377a2d5fc5e2
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Fri Dec 23 20:59:08 2016 +0200

    Disable hardware-assisted CRC32 on arm64 and s390x
    
    This fixes FTBFS on these architectures, as the buildd's do not seem to
    support the required instructions.
---
 debian/patches/disable-hw-crc32-on-arm64-s390x.patch | 13 +++++++++++++
 debian/patches/series                                |  1 +
 2 files changed, 14 insertions(+)

diff --git a/debian/patches/disable-hw-crc32-on-arm64-s390x.patch b/debian/patches/disable-hw-crc32-on-arm64-s390x.patch
new file mode 100644
index 0000000..534a087
--- /dev/null
+++ b/debian/patches/disable-hw-crc32-on-arm64-s390x.patch
@@ -0,0 +1,13 @@
+--- a/src/third_party/wiredtiger/SConscript
++++ b/src/third_party/wiredtiger/SConscript
+@@ -169,7 +169,9 @@
+ # If not available at runtime, we fall back to software in some cases.
+ #
+ # On zSeries we may disable because SLES 11 kernel doe not support the instructions.
+-if not (env['TARGET_ARCH'] == 's390x' and get_option("use-s390x-crc32") == "off"):
++# Debian: disable hardware-assisted crc32 on s390x and arm64, as at least the
++# buildd's do not support the instructions.
++if env['TARGET_ARCH'] not in ('s390x', 'arm64', 'aarch64'):
+     env.Append(CPPDEFINES=["HAVE_CRC32_HARDWARE"])
+ 
+ wtlib = env.Library(
diff --git a/debian/patches/series b/debian/patches/series
index d2c0785..e284eb3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ CVE-2016-6494.patch
 #use-mmapv1-on-i386
 fix-wt-checksum-on-arm64
 use-std::regex.patch
+disable-hw-crc32-on-arm64-s390x.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mongodb/pkg-mongodb.git