Wed Jan 20 10:01:19 2010 UTC ()
Avoid duplicate symbol definition for GC_push_regs in
sparc_netbsd_mach_dep.s and mach_dep.c.

>From PR 42634 by Bertrand Joel.

Bump PKGREVISION.


(wiz)
diff -r1.64 -r1.65 pkgsrc/devel/boehm-gc/Makefile
diff -r1.38 -r1.39 pkgsrc/devel/boehm-gc/distinfo
diff -r0 -r1.9 pkgsrc/devel/boehm-gc/patches/patch-ae
cvs diff -r1.64 -r1.65 pkgsrc/devel/boehm-gc/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/boehm-gc/Makefile 2009/11/10 18:35:13 1.64
+++ pkgsrc/devel/boehm-gc/Makefile 2010/01/20 10:01:19 1.65
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.64 2009/11/10 18:35:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.65 2010/01/20 10:01:19 wiz Exp $
2 2
3DISTNAME= gc-7.1 3DISTNAME= gc-7.1
4PKGNAME= ${DISTNAME:S/gc/boehm-gc/} 4PKGNAME= ${DISTNAME:S/gc/boehm-gc/}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/ 7MASTER_SITES= http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
8 8
9MAINTAINER= recht@NetBSD.org 9MAINTAINER= recht@NetBSD.org
10HOMEPAGE= http://www.hpl.hp.com/personal/Hans_Boehm/gc/ 10HOMEPAGE= http://www.hpl.hp.com/personal/Hans_Boehm/gc/
11COMMENT= Garbage collection and memory leak detection for C and C++ 11COMMENT= Garbage collection and memory leak detection for C and C++
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_LIBTOOL= YES 18USE_LIBTOOL= YES
cvs diff -r1.38 -r1.39 pkgsrc/devel/boehm-gc/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/boehm-gc/distinfo 2009/11/10 23:31:36 1.38
+++ pkgsrc/devel/boehm-gc/distinfo 2010/01/20 10:01:19 1.39
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.38 2009/11/10 23:31:36 asau Exp $ 1$NetBSD: distinfo,v 1.39 2010/01/20 10:01:19 wiz Exp $
2 2
3SHA1 (gc-7.1.tar.gz) = e84cba5d18f4ea5ed4e5fd3f1dc6a46bc190ff6f 3SHA1 (gc-7.1.tar.gz) = e84cba5d18f4ea5ed4e5fd3f1dc6a46bc190ff6f
4RMD160 (gc-7.1.tar.gz) = 9338c1128686395739e3acd9052a651d1dffffb2 4RMD160 (gc-7.1.tar.gz) = 9338c1128686395739e3acd9052a651d1dffffb2
5Size (gc-7.1.tar.gz) = 1077714 bytes 5Size (gc-7.1.tar.gz) = 1077714 bytes
6SHA1 (patch-aa) = 87a5bd5e83b0201d80a1e4e4ce6745c11b2e7cfe 6SHA1 (patch-aa) = 87a5bd5e83b0201d80a1e4e4ce6745c11b2e7cfe
7SHA1 (patch-ab) = 9b5133c7aa84e6824616e29613716a2fedd1d334 7SHA1 (patch-ab) = 9b5133c7aa84e6824616e29613716a2fedd1d334
8SHA1 (patch-ac) = 82f869fc4f52a9936395a7f50240b81434f2cb42 8SHA1 (patch-ac) = 82f869fc4f52a9936395a7f50240b81434f2cb42
 9SHA1 (patch-ae) = fde8f12c8c8dd3142c191f5f1c1854cd339babe9
File Added: pkgsrc/devel/boehm-gc/patches/Attic/patch-ae
$NetBSD: patch-ae,v 1.9 2010/01/20 10:01:19 wiz Exp $

--- mach_dep.c.orig	2007-08-13 21:49:11.000000000 +0000
+++ mach_dep.c
@@ -78,6 +78,7 @@ asm static void PushMacRegisters()
 #if defined(USE_ASM_PUSH_REGS)
 #  define HAVE_PUSH_REGS
 #else  /* No asm implementation */
+#if !defined(SPARC)
 void GC_push_regs()
 {
 #	if defined(M68K) && defined(AMIGA)
@@ -150,6 +151,7 @@ void GC_push_regs()
 #	endif	/* __MWERKS__ */
 #   endif	/* MACOS */
 }
+#endif /* !SPARC */
 #endif /* !USE_ASM_PUSH_REGS */
 
 #if defined(HAVE_PUSH_REGS) && defined(THREADS)