Sat Apr 18 22:02:11 2015 UTC ()
Pullup ticket #4666 - requested by joerg
devel/gperftools: build fix

Revisions pulled up:
- devel/gperftools/distinfo                                     1.3 via patch
- devel/gperftools/patches/patch-configure                      1.1
- devel/gperftools/patches/patch-src_base_atomicops-internals-arm-v6plus.h 1.1

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Tue Apr 14 14:40:02 UTC 2015

   Modified Files:
   	pkgsrc/devel/gperftools: distinfo
   Added Files:
   	pkgsrc/devel/gperftools/patches: patch-configure
   	    patch-src_base_atomicops-internals-arm-v6plus.h

   Log Message:
   Fix build on NetBSD/ARM.


(tron)
diff -r1.1 -r1.1.8.1 pkgsrc/devel/gperftools/distinfo
diff -r0 -r1.1.2.2 pkgsrc/devel/gperftools/patches/patch-configure
diff -r0 -r1.1.2.2 pkgsrc/devel/gperftools/patches/patch-src_base_atomicops-internals-arm-v6plus.h
cvs diff -r1.1 -r1.1.8.1 pkgsrc/devel/gperftools/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gperftools/distinfo 2014/04/16 14:56:07 1.1
+++ pkgsrc/devel/gperftools/distinfo 2015/04/18 22:02:11 1.1.8.1
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1$NetBSD: distinfo,v 1.1 2014/04/16 14:56:07 wiz Exp $ 1$NetBSD: distinfo,v 1.1.8.1 2015/04/18 22:02:11 tron Exp $
2 2
3SHA1 (gperftools-2.1.tar.gz) = b799b99d9f021988bbc931db1c21b2f94826d4f0 3SHA1 (gperftools-2.1.tar.gz) = b799b99d9f021988bbc931db1c21b2f94826d4f0
4RMD160 (gperftools-2.1.tar.gz) = 0cf9af2502e661d3771976e943ef2afb8b749983 4RMD160 (gperftools-2.1.tar.gz) = 0cf9af2502e661d3771976e943ef2afb8b749983
5Size (gperftools-2.1.tar.gz) = 1319896 bytes 5Size (gperftools-2.1.tar.gz) = 1319896 bytes
6SHA1 (patch-Makefile.in) = 61dcee2b8aa4cddc9e31b4728e28aea7fd958e41 6SHA1 (patch-Makefile.in) = 61dcee2b8aa4cddc9e31b4728e28aea7fd958e41
 7SHA1 (patch-configure) = 612e1dda5ecf65451153e9616f69e0c58add086a
 8SHA1 (patch-src_base_atomicops-internals-arm-v6plus.h) = b3aeddd10d2506192551485570c31c0b3ff02432
File Added: pkgsrc/devel/gperftools/patches/patch-configure
$NetBSD: patch-configure,v 1.1.2.2 2015/04/18 22:02:11 tron Exp $

--- configure.orig	2015-01-10 20:20:33.000000000 +0000
+++ configure
@@ -17334,6 +17334,7 @@ $as_echo_n "checking how to access the p
    pc_fields="$pc_fields uc_mcontext.mc_rip"           # FreeBSD (x86_64 [untested])
    pc_fields="$pc_fields uc_mcontext.__gregs[_REG_EIP]"  # NetBSD (i386)
    pc_fields="$pc_fields uc_mcontext.__gregs[_REG_RIP]"  # NetBSD (x86_64)
+   pc_fields="$pc_fields uc_mcontext.__gregs[_REG_PC]"   # NetBSD (arm)
    pc_fields="$pc_fields uc_mcontext->ss.eip"          # OS X (i386, <=10.4)
    pc_fields="$pc_fields uc_mcontext->__ss.__eip"      # OS X (i386, >=10.5)
    pc_fields="$pc_fields uc_mcontext->ss.rip"          # OS X (x86_64)
File Added: pkgsrc/devel/gperftools/patches/patch-src_base_atomicops-internals-arm-v6plus.h
$NetBSD: patch-src_base_atomicops-internals-arm-v6plus.h,v 1.1.2.2 2015/04/18 22:02:11 tron Exp $

--- src/base/atomicops-internals-arm-v6plus.h.orig	2014-12-06 22:51:40.000000000 +0000
+++ src/base/atomicops-internals-arm-v6plus.h
@@ -50,7 +50,7 @@
 # define BASE_ATOMICOPS_HAS_LDREXD_AND_STREXD
 #endif
 
-typedef int32_t Atomic32;
+typedef intptr_t Atomic32;
 
 namespace base {
 namespace subtle {