[pkgsrc/trunk]: pkgsrc/devel/libatomic_ops libatomic-ops: check if AO_AO_TS_T...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ec4d0f6092c
branches:  trunk
changeset: 375809:0ec4d0f6092c
user:      maya <maya%pkgsrc.org@localhost>
date:      Wed Feb 21 23:59:33 2018 +0000

description:
libatomic-ops: check if AO_AO_TS_T is defined before using it

PR pkg/53046: x11/libdrm doesn't compile on GNU/Linux

diffstat:

 devel/libatomic_ops/Makefile         |   3 ++-
 devel/libatomic_ops/distinfo         |   4 ++--
 devel/libatomic_ops/patches/patch-ad |  17 ++++++++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diffs (60 lines):

diff -r 9e857180fa31 -r 0ec4d0f6092c devel/libatomic_ops/Makefile
--- a/devel/libatomic_ops/Makefile      Wed Feb 21 16:59:59 2018 +0000
+++ b/devel/libatomic_ops/Makefile      Wed Feb 21 23:59:33 2018 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2018/01/01 20:32:55 adam Exp $
+# $NetBSD: Makefile,v 1.15 2018/02/21 23:59:33 maya Exp $
 
 DISTNAME=      libatomic_ops-7.6.2
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ivmai/}
 
diff -r 9e857180fa31 -r 0ec4d0f6092c devel/libatomic_ops/distinfo
--- a/devel/libatomic_ops/distinfo      Wed Feb 21 16:59:59 2018 +0000
+++ b/devel/libatomic_ops/distinfo      Wed Feb 21 23:59:33 2018 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2018/01/01 20:32:55 adam Exp $
+$NetBSD: distinfo,v 1.21 2018/02/21 23:59:33 maya Exp $
 
 SHA1 (libatomic_ops-7.6.2.tar.gz) = ebed1891250cc8e2c952b88fc07e1db2a213f7e2
 RMD160 (libatomic_ops-7.6.2.tar.gz) = 8764acd6d84488bbc79f5239037ccc3d4a59f2e2
 SHA512 (libatomic_ops-7.6.2.tar.gz) = 9149c9328ec22ab80469892b40c135f20b6cf6edff63b8de6f16ab0b209f40d1420ad012a40c80009dfb4cdc826feb72fa826d6abf61211516aabcf463c17fe4
 Size (libatomic_ops-7.6.2.tar.gz) = 496917 bytes
-SHA1 (patch-ad) = 6fb90f31ca7309c8ea65fb482a9964c5267c35fe
+SHA1 (patch-ad) = b5db1656821058aae2ec81c20ffc4c0740049314
diff -r 9e857180fa31 -r 0ec4d0f6092c devel/libatomic_ops/patches/patch-ad
--- a/devel/libatomic_ops/patches/patch-ad      Wed Feb 21 16:59:59 2018 +0000
+++ b/devel/libatomic_ops/patches/patch-ad      Wed Feb 21 23:59:33 2018 +0000
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.5 2017/05/29 12:55:10 wiz Exp $
+$NetBSD: patch-ad,v 1.6 2018/02/21 23:59:33 maya Exp $
 
 revision 1.2
 date: 2009-01-31 21:05:57 +0100;  author: sketch;  state: Exp;  lines: +2 -2;
 Sun Studio x86 implementation isn't quite good enough yet for e.g.
 pulseaudio, so instead use the generic pthread implementation for now.
 
---- src/atomic_ops.h.orig      2013-11-10 09:57:12.000000000 +0000
+Check if AO_AO_TS_T is defined before testing it (PR pkg/53046)
+
+--- src/atomic_ops.h.orig      2017-12-24 08:31:12.000000000 +0000
 +++ src/atomic_ops.h
-@@ -351,7 +351,10 @@
+@@ -412,7 +412,10 @@
  # endif
  #endif
  
@@ -19,3 +21,12 @@
      && !defined(AO_USE_PTHREAD_DEFS)
  # include "atomic_ops/sysdeps/sunc/sparc.h"
  # define AO_CAN_EMUL_CAS
+@@ -433,7 +436,7 @@
+ 
+ /* The most common way to clear a test-and-set location         */
+ /* at the end of a critical section.                            */
+-#if AO_AO_TS_T && !defined(AO_HAVE_CLEAR)
++#if defined(AO_AO_TS_T) && AO_AO_TS_T && !defined(AO_HAVE_CLEAR)
+ # define AO_CLEAR(addr) AO_store_release((AO_TS_t *)(addr), AO_TS_CLEAR)
+ # define AO_HAVE_CLEAR
+ #endif