CVS commit: pkgsrc/devel/protobuf

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Oct  4 11:48:16 UTC 2016

Modified Files:
        pkgsrc/devel/protobuf: distinfo
        pkgsrc/devel/protobuf/patches:
            patch-src_google_protobuf_stubs_atomicops.h

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/protobuf/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/protobuf/distinfo
diff -u pkgsrc/devel/protobuf/distinfo:1.8 pkgsrc/devel/protobuf/distinfo:1.9
--- pkgsrc/devel/protobuf/distinfo:1.8  Sat Aug  6 21:38:45 2016
+++ pkgsrc/devel/protobuf/distinfo      Tue Oct  4 11:48:16 2016
@@ -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 @@ SHA512 (protobuf-cpp-3.0.0.tar.gz) = 724
 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

Index: pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h
diff -u pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h:1.3 pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h:1.4
--- pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h:1.3       Sat Aug  6 11:40:14 2016
+++ pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h   Tue Oct  4 11:48:16 2016
@@ -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 @@ Add ARM support.
  
  // 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;