[Pkg-mongodb-maintainers] [pkg-mongodb] 03/04: Use the correct WT arm64 checksum implementation in WT; fixes FTBFS on ARM64

[Apollon Oikonomopoulos]

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

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

commit 45d44758375d2d1f4209c179d4271635cb69ad64
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Thu Dec 15 18:29:15 2016 +0200

    Use the correct WT arm64 checksum implementation in WT; fixes FTBFS on ARM64
---
 debian/patches/fix-wt-checksum-on-arm64 | 29 +++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 30 insertions(+)

diff --git a/debian/patches/fix-wt-checksum-on-arm64 b/debian/patches/fix-wt-checksum-on-arm64
new file mode 100644
index 0000000..02ea95c
--- /dev/null
+++ b/debian/patches/fix-wt-checksum-on-arm64
@@ -0,0 +1,29 @@
+Author: Apollon Oikonomopoulos <apoikos at debian.org>
+Description: WT: fix ARM64_HOST detection
+ Currently the ARM64 build is broken because checksum/crc32-arm64.c is not
+ pulled in and __wt_checksum_init remains undefined.
+ .
+ Fix ARM64 detection by including both 'aarch64' and 'arm64' target
+ architectures.
+Last-Update: 2016-12-15
+Forwarded: no
+--- a/src/third_party/wiredtiger/SConscript
++++ b/src/third_party/wiredtiger/SConscript
+@@ -133,7 +133,7 @@
+     'POSIX_HOST'   : not env.TargetOSIs('windows'),
+     'WINDOWS_HOST' : env.TargetOSIs('windows'),
+ 
+-    'ARM64_HOST'   : env['TARGET_ARCH'] == 'aarch64',
++    'ARM64_HOST'   : env['TARGET_ARCH'] in ('aarch64', 'arm64'),
+     'POWERPC_HOST' : env['TARGET_ARCH'] == 'ppc64le',
+     'X86_HOST'     : env['TARGET_ARCH'] == 'x86_64',
+     'ZSERIES_HOST' : env['TARGET_ARCH'] == 's390x',
+@@ -165,7 +165,7 @@
+ # 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"):
+     # Disable ARM hardware CRC for now - the extensions aren't always available
+-    if env['TARGET_ARCH'] != 'aarch64':
++    if env['TARGET_ARCH'] not in ('aarch64', 'arm64'):
+         env.Append(CPPDEFINES=["HAVE_CRC32_HARDWARE"])
+ 
+ wtlib = env.Library(
diff --git a/debian/patches/series b/debian/patches/series
index a264260..8c88f6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fix-boost-1.60-build.patch
 fix-boost-1.62-build.patch
 CVE-2016-6494.patch
 use-mmapv1-on-i386
+fix-wt-checksum-on-arm64

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