[gentoo-commits] gentoo-x86 commit in dev-libs/protobuf/files: protobuf-2.5.0-x32.patch

[Mike Frysinger (vapier)]

vapier      13/11/30 22:50:23

  Added:                protobuf-2.5.0-x32.patch
  Log:
  Fix builds on x32.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

Revision  Changes    Path
1.1                  dev-libs/protobuf/files/protobuf-2.5.0-x32.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch?rev=1.1&content-type=text/plain

Index: protobuf-2.5.0-x32.patch
===================================================================
fix from upstream for building w/x32

https://code.google.com/p/protobuf/issues/detail?id=474

--- src/google/protobuf/stubs/atomicops.h	(revision 491)
+++ src/google/protobuf/stubs/atomicops.h	(revision 492)
@@ -66,7 +66,7 @@ typedef int32 Atomic32;
 #ifdef GOOGLE_PROTOBUF_ARCH_64_BIT
 // We need to be able to go between Atomic64 and AtomicWord implicitly.  This
 // means Atomic64 and AtomicWord should be the same type on 64-bit.
-#if defined(GOOGLE_PROTOBUF_OS_NACL)
+#if defined(__ILP32__) || defined(GOOGLE_PROTOBUF_OS_NACL)
 // NaCl's intptr_t is not actually 64-bits on 64-bit!
 // http://code.google.com/p/nativeclient/issues/detail?id=1162
 typedef int64 Atomic64;