[debian-mysql] Bug#888965: mysql-5.7: Please add patch to fix protobuf on sparc64

[John Paul Adrian Glaubitz]

Source: mysql-5.7
Version: 5.7.21-1
Severity: normal
Tags: patch
User: debian-sparc at lists.debian.org
Usertags: sparc64

Hi!

mysql-5.7 FTBFS on sparc64 because the embedded version of protobuf
is ancient and is missing a patch to fix the platform definitions
for sparc64.

I'm attaching a patch which fixes this. Please include it in the
next upload.

Thanks,
Adrian

--
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz at debian.org
`. `'   Freie Universitaet Berlin - glaubitz at physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913
-------------- next part --------------
Description: Fix protobuf platform definitions on sparc64
Author: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
Last-Update: 2018-01-31

--- mysql-5.7-5.7.20.orig/extra/protobuf/protobuf-2.6.1/src/google/protobuf/stubs/platform_macros.h
+++ mysql-5.7-5.7.20/extra/protobuf/protobuf-2.6.1/src/google/protobuf/stubs/platform_macros.h
@@ -67,7 +67,7 @@
 #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
 #elif defined(sparc)
 #define GOOGLE_PROTOBUF_ARCH_SPARC 1
-#ifdef SOLARIS_64BIT_ENABLED
+#if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
 #define GOOGLE_PROTOBUF_ARCH_64_BIT 1
 #else
 #define GOOGLE_PROTOBUF_ARCH_32_BIT 1