pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/libatomic_ops Import libatomic_ops from wip, cop...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/47e81942295b
branches:  trunk
changeset: 593391:47e81942295b
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Tue Oct 04 18:15:29 2011 +0000

description:
Import libatomic_ops from wip, copy distfile to ftp.netbsd.org.

Fixes build on Mac OS X, thus fixing PR pkg/45377.

diffstat:

 devel/libatomic_ops/MESSAGE          |  13 +++++++++++++
 devel/libatomic_ops/Makefile         |   7 ++++---
 devel/libatomic_ops/Makefile.version |   8 ++++----
 devel/libatomic_ops/PLIST            |   9 ++++++++-
 devel/libatomic_ops/buildlink3.mk    |   6 +++---
 devel/libatomic_ops/distinfo         |  17 +++++++----------
 devel/libatomic_ops/patches/patch-aa |  12 ------------
 devel/libatomic_ops/patches/patch-ab |   8 ++++----
 devel/libatomic_ops/patches/patch-ac |   8 ++++----
 devel/libatomic_ops/patches/patch-ad |  14 +++++++-------
 devel/libatomic_ops/patches/patch-ae |  12 ------------
 devel/libatomic_ops/patches/patch-af |   9 ---------
 12 files changed, 54 insertions(+), 69 deletions(-)

diffs (253 lines):

diff -r a845859990b6 -r 47e81942295b devel/libatomic_ops/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libatomic_ops/MESSAGE       Tue Oct 04 18:15:29 2011 +0000
@@ -0,0 +1,13 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2011/10/04 18:15:29 bsiegert Exp $
+There are two kinds of entities in:
+                               ${PREFIX}/include/libatomic_ops/sysdeps
+
+- Subdirectories corresponding to specific compilers
+  (or compiler/OS combinations).
+
+  Each of these includes one or more architecture-specific headers.
+
+- More generic header files corresponding to a particular ordering and/or
+  atomicity property that might be shared by multiple hardware platforms.
+===========================================================================
diff -r a845859990b6 -r 47e81942295b devel/libatomic_ops/Makefile
--- a/devel/libatomic_ops/Makefile      Tue Oct 04 15:37:36 2011 +0000
+++ b/devel/libatomic_ops/Makefile      Tue Oct 04 18:15:29 2011 +0000
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2009/01/31 20:05:57 sketch Exp $
+# $NetBSD: Makefile,v 1.5 2011/10/04 18:15:29 bsiegert Exp $
 #
 .include "Makefile.version"
 
 DISTNAME=      libatomic_ops-${LIBATOMIC_OPS_SNAPDATE}
-PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
+#MASTER_SITES= http://ryo-on.users.sourceforge.net/distrib/
+LICENSE=       gnu-gpl-v2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://bdwgc.sourceforge.net/
@@ -13,7 +14,7 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-WRKSRC=                ${WRKDIR}/libatomic_ops-${LIBATOMIC_OPS_VERSION}
+WRKSRC=                ${WRKDIR}/libatomic_ops
 GNU_CONFIGURE= yes
 USE_TOOLS+=    gmake automake autoconf autoreconf
 USE_LIBTOOL=   yes
diff -r a845859990b6 -r 47e81942295b devel/libatomic_ops/Makefile.version
--- a/devel/libatomic_ops/Makefile.version      Tue Oct 04 15:37:36 2011 +0000
+++ b/devel/libatomic_ops/Makefile.version      Tue Oct 04 18:15:29 2011 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.1.1.1 2008/10/25 00:32:23 bjs Exp $
+# $NetBSD: Makefile.version,v 1.2 2011/10/04 18:15:29 bsiegert Exp $
 #
-# CVS repo:    :pserver:anonymous%bdwgc.cvs.sourceforge.net@localhost:/cvsroot
+# CVS repo:    :pserver:anonymous%bdwgc.cvs.sourceforge.net@localhost:/cvsroot/bdwgc
 # CVS module:  bdwgc
 
-LIBATOMIC_OPS_VERSION= 1.2
-LIBATOMIC_OPS_SNAPDATE=        20081024
+#LIBATOMIC_OPS_VERSION=        7.2alpha7
+LIBATOMIC_OPS_SNAPDATE=        20110807
diff -r a845859990b6 -r 47e81942295b devel/libatomic_ops/PLIST
--- a/devel/libatomic_ops/PLIST Tue Oct 04 15:37:36 2011 +0000
+++ b/devel/libatomic_ops/PLIST Tue Oct 04 18:15:29 2011 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:48:51 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/10/04 18:15:29 bsiegert Exp $
 include/atomic_ops.h
 include/atomic_ops/generalize-small.h
 include/atomic_ops/generalize.h
@@ -9,12 +9,14 @@
 include/atomic_ops/sysdeps/all_aligned_atomic_load_store.h
 include/atomic_ops/sysdeps/all_atomic_load_store.h
 include/atomic_ops/sysdeps/ao_t_is_int.h
+include/atomic_ops/sysdeps/armcc/arm_v6.h
 include/atomic_ops/sysdeps/atomic_load_store.h
 include/atomic_ops/sysdeps/char_acquire_release_volatile.h
 include/atomic_ops/sysdeps/char_atomic_load_store.h
 include/atomic_ops/sysdeps/emul_cas.h
 include/atomic_ops/sysdeps/gcc/alpha.h
 include/atomic_ops/sysdeps/gcc/arm.h
+include/atomic_ops/sysdeps/gcc/avr32.h
 include/atomic_ops/sysdeps/gcc/cris.h
 include/atomic_ops/sysdeps/gcc/hppa.h
 include/atomic_ops/sysdeps/gcc/ia64.h
@@ -22,6 +24,7 @@
 include/atomic_ops/sysdeps/gcc/mips.h
 include/atomic_ops/sysdeps/gcc/powerpc.h
 include/atomic_ops/sysdeps/gcc/s390.h
+include/atomic_ops/sysdeps/gcc/sh.h
 include/atomic_ops/sysdeps/gcc/sparc.h
 include/atomic_ops/sysdeps/gcc/x86.h
 include/atomic_ops/sysdeps/gcc/x86_64.h
@@ -33,6 +36,8 @@
 include/atomic_ops/sysdeps/int_acquire_release_volatile.h
 include/atomic_ops/sysdeps/int_aligned_atomic_load_store.h
 include/atomic_ops/sysdeps/int_atomic_load_store.h
+include/atomic_ops/sysdeps/msftc/arm.h
+include/atomic_ops/sysdeps/msftc/common32_defs.h
 include/atomic_ops/sysdeps/msftc/x86.h
 include/atomic_ops/sysdeps/msftc/x86_64.h
 include/atomic_ops/sysdeps/ordered.h
@@ -43,6 +48,8 @@
 include/atomic_ops/sysdeps/short_atomic_load_store.h
 include/atomic_ops/sysdeps/standard_ao_double_t.h
 include/atomic_ops/sysdeps/sunc/sparc.h
+include/atomic_ops/sysdeps/sunc/x86.h
+include/atomic_ops/sysdeps/sunc/x86_64.h
 include/atomic_ops/sysdeps/test_and_set_t_is_ao_t.h
 include/atomic_ops/sysdeps/test_and_set_t_is_char.h
 include/atomic_ops_malloc.h
diff -r a845859990b6 -r 47e81942295b devel/libatomic_ops/buildlink3.mk
--- a/devel/libatomic_ops/buildlink3.mk Tue Oct 04 15:37:36 2011 +0000
+++ b/devel/libatomic_ops/buildlink3.mk Tue Oct 04 18:15:29 2011 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2011/10/04 18:15:29 bsiegert Exp $
 
 BUILDLINK_TREE+=       libatomic_ops
 
 .if !defined(LIBATOMIC_OPS_BUILDLINK3_MK)
 LIBATOMIC_OPS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libatomic_ops+=  libatomic_ops>=20081024nb1
-BUILDLINK_PKGSRCDIR.libatomic_ops?=    ../../devel/libatomic_ops
+BUILDLINK_API_DEPENDS.libatomic_ops+=  libatomic_ops>=20110807
+BUILDLINK_PKGSRCDIR.libatomic_ops?=    ../../wip/libatomic_ops
 .endif # LIBATOMIC_OPS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libatomic_ops
diff -r a845859990b6 -r 47e81942295b devel/libatomic_ops/distinfo
--- a/devel/libatomic_ops/distinfo      Tue Oct 04 15:37:36 2011 +0000
+++ b/devel/libatomic_ops/distinfo      Tue Oct 04 18:15:29 2011 +0000
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.9 2009/08/01 21:25:03 tnn Exp $
+$NetBSD: distinfo,v 1.10 2011/10/04 18:15:29 bsiegert Exp $
 
-SHA1 (libatomic_ops-20081024.tar.gz) = 70dcc68c89ea8ce8b8e6c936ea337eca31f13662
-RMD160 (libatomic_ops-20081024.tar.gz) = a9194631fafc2d4ce68cea93dbc212d7212cab13
-Size (libatomic_ops-20081024.tar.gz) = 193399 bytes
-SHA1 (patch-aa) = bf53ad892ba270b1d7a9bd1fa14012ca83ab5323
-SHA1 (patch-ab) = 74674124fff34faf2aae0d694566c66ffaf9df25
-SHA1 (patch-ac) = 40eeac276e322ea6f28743c183c11e92b1ab8de5
-SHA1 (patch-ad) = 1499b105450beba70efdd3cc6bf8dd0270734c22
-SHA1 (patch-ae) = 6a35e29c32b8e16da9ed9e5526851d5a0ff47fd4
-SHA1 (patch-af) = f960ab05b17d9819d3bc383b66d3d7e990bd7e8f
+SHA1 (libatomic_ops-20110807.tar.gz) = 9cd093513991856b90a2e82e205525dccb3ad52a
+RMD160 (libatomic_ops-20110807.tar.gz) = ffc834193d51806a890b55de8525c00913878c14
+Size (libatomic_ops-20110807.tar.gz) = 239002 bytes
+SHA1 (patch-ab) = 82366e5ee296ea94e3f495f4962dedc42ea7e7b8
+SHA1 (patch-ac) = 29564426dcf009571d75efde31f1b499e1585a6c
+SHA1 (patch-ad) = 3c48f40099f7e23e7575c284679537740c0e2f6a
diff -r a845859990b6 -r 47e81942295b devel/libatomic_ops/patches/patch-aa
--- a/devel/libatomic_ops/patches/patch-aa      Tue Oct 04 15:37:36 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/10/25 00:32:23 bjs Exp $
-
-We install this file in share/doc/libatomic_ops/README_headers.
-
---- src/atomic_ops/sysdeps/README.orig 2006-07-11 19:29:30.000000000 -0400
-+++ src/atomic_ops/sysdeps/README
-@@ -1,4 +1,4 @@
--There are two kinds of entities in this directory:
-+There are two kinds of entities in <libatomic_ops/sysdeps>:
- 
- - Subdirectories corresponding to specific compilers (or compiler/OS combinations).
-   Each of these includes one or more architecture-specific headers.
diff -r a845859990b6 -r 47e81942295b devel/libatomic_ops/patches/patch-ab
--- a/devel/libatomic_ops/patches/patch-ab      Tue Oct 04 15:37:36 2011 +0000
+++ b/devel/libatomic_ops/patches/patch-ab      Tue Oct 04 18:15:29 2011 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2008/12/22 02:47:24 jmcneill Exp $
+$NetBSD: patch-ab,v 1.2 2011/10/04 18:15:30 bsiegert Exp $
 
---- src/Makefile.am.orig       2006-07-11 19:29:29.000000000 -0400
-+++ src/Makefile.am    2008-12-21 21:42:31.000000000 -0500
-@@ -3,14 +3,14 @@
+--- src/Makefile.am.orig       2009-09-29 13:41:49.000000000 +0000
++++ src/Makefile.am
+@@ -3,14 +3,14 @@ SUBDIRS=atomic_ops
  AM_CFLAGS=@PICFLAG@
  
  include_HEADERS=atomic_ops.h atomic_ops_stack.h atomic_ops_malloc.h
diff -r a845859990b6 -r 47e81942295b devel/libatomic_ops/patches/patch-ac
--- a/devel/libatomic_ops/patches/patch-ac      Tue Oct 04 15:37:36 2011 +0000
+++ b/devel/libatomic_ops/patches/patch-ac      Tue Oct 04 18:15:29 2011 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2008/12/22 02:47:24 jmcneill Exp $
+$NetBSD: patch-ac,v 1.2 2011/10/04 18:15:30 bsiegert Exp $
 
---- configure.ac.orig  2008-12-21 21:44:17.000000000 -0500
-+++ configure.ac       2008-12-21 21:44:24.000000000 -0500
-@@ -4,6 +4,7 @@
+--- configure.ac.orig  2011-06-15 11:41:30.000000000 +0000
++++ configure.ac
+@@ -4,6 +4,7 @@ AC_CANONICAL_TARGET([])
  AC_CONFIG_SRCDIR(src/atomic_ops.c)
  AM_INIT_AUTOMAKE
  AC_PROG_RANLIB
diff -r a845859990b6 -r 47e81942295b devel/libatomic_ops/patches/patch-ad
--- a/devel/libatomic_ops/patches/patch-ad      Tue Oct 04 15:37:36 2011 +0000
+++ b/devel/libatomic_ops/patches/patch-ad      Tue Oct 04 18:15:29 2011 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.2 2009/01/31 20:05:57 sketch Exp $
+$NetBSD: patch-ad,v 1.3 2011/10/04 18:15:30 bsiegert Exp $
 
---- src/atomic_ops.h.orig      Wed Oct 22 02:12:17 2008
-+++ src/atomic_ops.h   Mon Jan 26 14:48:46 2009
-@@ -251,7 +251,10 @@
- # endif
+--- src/atomic_ops.h.orig      2010-09-15 19:18:33.000000000 +0000
++++ src/atomic_ops.h
+@@ -325,7 +325,10 @@
+ # endif /* __x86_64 */
  #endif
  
 -#if !defined(__GNUC__) && (defined(sparc) || defined(__sparc)) \
@@ -12,5 +12,5 @@
 +#   define AO_CAN_EMUL_CAS
 +#elif !defined(__GNUC__) && (defined(sparc) || defined(__sparc)) \
      && !defined(AO_USE_PTHREAD_DEFS)
- #   include "atomic_ops/sysdeps/sunc/sparc.h"
- #   define AO_CAN_EMUL_CAS
+ # include "atomic_ops/sysdeps/sunc/sparc.h"
+ # define AO_CAN_EMUL_CAS
diff -r a845859990b6 -r 47e81942295b devel/libatomic_ops/patches/patch-ae
--- a/devel/libatomic_ops/patches/patch-ae      Tue Oct 04 15:37:36 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2009/07/22 10:33:21 tnn Exp $
-
---- src/atomic_ops/sysdeps/Makefile.am.orig    2008-05-31 02:59:36.000000000 +0200
-+++ src/atomic_ops/sysdeps/Makefile.am
-@@ -25,7 +25,6 @@ nobase_sysdep_HEADERS= generic_pthread.h
-         README \
-       \
-         gcc/alpha.h gcc/arm.h gcc/x86.h \
--        gcc/hppa.h gcc/ia64.h \
-         gcc/powerpc.h gcc/sparc.h \
-         gcc/hppa.h gcc/m68k.h gcc/mips.h gcc/s390.h \
-         gcc/ia64.h gcc/x86_64.h gcc/cris.h \
diff -r a845859990b6 -r 47e81942295b devel/libatomic_ops/patches/patch-af
--- a/devel/libatomic_ops/patches/patch-af      Tue Oct 04 15:37:36 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$NetBSD: patch-af,v 1.3 2009/08/01 21:25:04 tnn Exp $
-
---- doc/Makefile.am.orig       2006-07-12 01:29:28.000000000 +0200
-+++ doc/Makefile.am
-@@ -1,3 +1,3 @@
- # installed documentation
- #
--dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt
-+dist_pkgdata_DATA=COPYING LICENSING.txt README.txt README_stack.txt README_malloc.txt README_win32.txt



Home | Main Index | Thread Index | Old Index