[pkgsrc/trunk]: pkgsrc/devel/protobuf protobuf: extend workaround on long siz...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3152a1dfce8
branches:  trunk
changeset: 353399:d3152a1dfce8
user:      maya <maya%pkgsrc.org@localhost>
date:      Tue Oct 04 11:48:16 2016 +0000

description:
protobuf: extend workaround on long size to all 32bit platforms.
use 32bit atomic in 32bit platforms.

add comment from identical firefox patch.

tested 32bit netbsd/i386 (chroot), netbsd/mips.

fixes netbsd/mips build.

diffstat:

 devel/protobuf/distinfo                                            |  4 ++--
 devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h |  7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 6141b351124a -r d3152a1dfce8 devel/protobuf/distinfo
--- a/devel/protobuf/distinfo   Tue Oct 04 11:45:34 2016 +0000
+++ b/devel/protobuf/distinfo   Tue Oct 04 11:48:16 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2016/08/06 21:38:45 kamil Exp $
+$NetBSD: distinfo,v 1.9 2016/10/04 11:48:16 maya Exp $
 
 SHA1 (protobuf-cpp-3.0.0.tar.gz) = 00140d255922bf33ef3842168954e3269fbba3af
 RMD160 (protobuf-cpp-3.0.0.tar.gz) = 01a00093e0f7297b3fb7933ef5700d2753109c95
@@ -6,5 +6,5 @@
 Size (protobuf-cpp-3.0.0.tar.gz) = 4075839 bytes
 SHA1 (patch-gmock_configure) = 49a4c9301ad4c1973ee7058213df50a7833161f0
 SHA1 (patch-gmock_configure.ac) = cfd7b7c87eff4b06ce6ecb34dec046561bbdc113
-SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = 6a13cf5597a09f862450916b00d8eae42877b5da
+SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = 0427f23c3818f637d2ef4f54079a60f8a2f599a0
 SHA1 (patch-src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = 93cf8135660e945044e5a560a3010e32e660ae6f
diff -r 6141b351124a -r d3152a1dfce8 devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h
--- a/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h        Tue Oct 04 11:45:34 2016 +0000
+++ b/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h        Tue Oct 04 11:48:16 2016 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_google_protobuf_stubs_atomicops.h,v 1.3 2016/08/06 11:40:14 kamil Exp $
+$NetBSD: patch-src_google_protobuf_stubs_atomicops.h,v 1.4 2016/10/04 11:48:16 maya Exp $
 
-Add ARM support.
+NetBSD arm and mips uses long for intptr_t, which fails -fpermissive checks.
+So explicitly use int32 here instead.
 
 --- src/google/protobuf/stubs/atomicops.h.orig 2016-04-28 21:34:30.000000000 +0000
 +++ src/google/protobuf/stubs/atomicops.h
@@ -8,7 +9,7 @@
  
  // Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
  // Atomic64 routines below, depending on your architecture.
-+#ifdef __arm__
++#ifndef _LP64
 +typedef Atomic32 AtomicWord;
 +#else
  typedef intptr_t AtomicWord;