[PATCH] devel/boehm-gc: update to 7.2d
Takefu
takefu at airport.fm
Fri Jun 7 01:00:20 UTC 2013
>Submitter-Id: current-users
>Originator: Takefu
>Organization: FOX Amateur Radio Club
>Confidential: no
>Synopsis: [PATCH] devel/boehm-gc: update to 7.2d
>Severity: non-critical
>Priority: low
>Category: ports
>Class: update
>Release: FreeBSD 8.3-RELEASE-p8 i386
>Environment:
System: FreeBSD RELENG83-ix86.localIPv4.airport.fm 8.3-RELEASE-p8 FreeBSD 8.3-RELEASE-p8 #0: Thu May 9 10:13:20 JST
>Description:
- Update to 7.2d
- Fix header trim
>How-To-Repeat:
>Fix:
--- boehm-gc-7.2d.patch begins here ---
diff -ruN /usr/ports/devel/boehm-gc/Makefile ./Makefile
--- /usr/ports/devel/boehm-gc/Makefile 2013-03-19 22:04:30.000000000 +0900
+++ ./Makefile 2013-06-06 10:19:12.000000000 +0900
@@ -1,13 +1,8 @@
-# New ports collection makefile for: boehm-gc
-# Date created: 15 November 1996
-# Whom: Mike McGaughey <mmcg at cs.monash.edu.au>
-#
-# $FreeBSD: devel/boehm-gc/Makefile 314640 2013-03-19 13:04:30Z eadler $
-#
+# Created by: Mike McGaughey <mmcg at cs.monash.edu.au>
+# $FreeBSD$
PORTNAME= boehm-gc
-PORTVERSION= 7.1
-PORTREVISION= 0
+PORTVERSION= 7.2d
CATEGORIES= devel
MASTER_SITES= http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
DISTNAME= gc-${PORTVERSION:S/.a/alpha/}
@@ -16,11 +11,12 @@
COMMENT= Garbage collection and memory leak detection for C and C++
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-cplusplus --disable-static --disable-threads
MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= DEBUG
+WRKSRC= ${WRKDIR}/${DISTNAME:S|d||}
.include <bsd.port.pre.mk>
diff -ruN /usr/ports/devel/boehm-gc/distinfo ./distinfo
--- /usr/ports/devel/boehm-gc/distinfo 2012-07-14 22:54:48.000000000 +0900
+++ ./distinfo 2013-06-06 09:08:21.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (gc-7.1.tar.gz) = e3cef6028fe3efe7de3bcf4107c880eae50b3ee79841450d885467c09bcebf30
-SIZE (gc-7.1.tar.gz) = 1077714
+SHA256 (gc-7.2d.tar.gz) = d9fe0ae8650d43746a48bfb394cab01a319f3809cee19f8ebd16aa985b511c5e
+SIZE (gc-7.2d.tar.gz) = 1263064
diff -ruN /usr/ports/devel/boehm-gc/files/patch-Makefile.in ./files/patch-Makefile.in
--- /usr/ports/devel/boehm-gc/files/patch-Makefile.in 2012-07-14 22:54:48.000000000 +0900
+++ ./files/patch-Makefile.in 2013-06-06 09:19:11.000000000 +0900
@@ -1,11 +1,11 @@
---- Makefile.in.orig 2009-10-20 01:25:20.000000000 +0400
-+++ Makefile.in 2009-10-20 01:25:30.000000000 +0400
-@@ -75,7 +75,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
+--- Makefile.in.orig 2013-06-06 09:17:37.000000000 +0900
++++ Makefile.in 2013-06-06 09:18:33.000000000 +0900
+@@ -73,7 +73,7 @@
+ + VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
diff -ruN /usr/ports/devel/boehm-gc/files/patch-dbg_mlc.c ./files/patch-dbg_mlc.c
--- /usr/ports/devel/boehm-gc/files/patch-dbg_mlc.c 2012-07-14 22:54:48.000000000 +0900
+++ ./files/patch-dbg_mlc.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,77 +0,0 @@
---- dbg_mlc.c.orig 2009-10-20 00:34:39.000000000 +0400
-+++ dbg_mlc.c 2009-10-20 00:41:22.000000000 +0400
-@@ -456,10 +456,34 @@
- GC_register_displacement((word)sizeof(oh) + offset);
- }
- -+#if defined(__FreeBSD__)
-+#include <dlfcn.h>
-+static void GC_caller_func_offset(ad, symp, offp)
-+const GC_word ad;
-+const char **symp;
-+int *offp;
-+{
-+ Dl_info caller;
-+ if (dladdr((const void *)ad, &caller) && caller.dli_sname != NULL) {
-+ *symp = caller.dli_sname;
-+ *offp = (const char *)ad - (const char *)caller.dli_saddr;
-+ }
-+}
-+#else
-+#define GC_caller_func(ad, symp, offp)
-+#endif
-+
- void * GC_debug_malloc(size_t lb, GC_EXTRA_PARAMS)
- {
- void * result = GC_malloc(lb + DEBUG_BYTES);
-- -+
-+#ifdef GC_ADD_CALLER
-+ if (s == NULL) {
-+ GC_caller_func_offset(ra, &s, &i);
-+ if (s == NULL)
-+ s = "unknown";
-+ }
-+#endif
- if (result == 0) {
- GC_err_printf("GC_debug_malloc(%lu) returning NIL (",
- (unsigned long) lb);
-@@ -764,6 +788,13 @@
- size_t old_sz;
- hdr * hhdr;
- -+#ifdef GC_ADD_CALLER
-+ if (s == NULL) {
-+ GC_caller_func_offset(ra, &s, &i);
-+ if (s == NULL)
-+ s = "unknown";
-+ }
-+#endif
- if (p == 0) return(GC_debug_malloc(lb, OPT_RA s, i));
- if (base == 0) {
- GC_err_printf("Attempt to reallocate invalid pointer %p\n", p);
-@@ -1041,17 +1072,21 @@
- }
- - #ifdef GC_ADD_CALLER
--# define RA GC_RETURN_ADDR,
-+# ifdef GC_RETURN_ADDR_PARENT
-+# define RA GC_RETURN_ADDR_PARENT,
-+# else
-+# define RA GC_RETURN_ADDR,
-+# endif
- #else
- # define RA
- #endif
- - void * GC_debug_malloc_replacement(size_t lb)
- {
-- return GC_debug_malloc(lb, RA "unknown", 0);
-+ return GC_debug_malloc(lb, RA NULL, 0);
- }
- - void * GC_debug_realloc_replacement(void *p, size_t lb)
- {
-- return GC_debug_realloc(p, lb, RA "unknown", 0);
-+ return GC_debug_realloc(p, lb, RA NULL, 0);
- }
diff -ruN /usr/ports/devel/boehm-gc/files/patch-dyn_load.c ./files/patch-dyn_load.c
--- /usr/ports/devel/boehm-gc/files/patch-dyn_load.c 2012-07-14 22:54:48.000000000 +0900
+++ ./files/patch-dyn_load.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,15 +0,0 @@
---- dyn_load.c.orig Thu May 6 08:03:06 2004
-+++ dyn_load.c Sun Oct 31 01:53:01 2004
-@@ -97,6 +97,12 @@
- # else
- # define ElfW(type) Elf64_##type
- # endif
-+# elif defined(__FreeBSD__)
-+# if __ELF_WORD_SIZE == 32
-+# define ElfW(type) Elf32_##type
-+# else
-+# define ElfW(type) Elf64_##type
-+# endif
- # else
- # if !defined(ELF_CLASS) || ELF_CLASS == ELFCLASS32
- # define ElfW(type) Elf32_##type
diff -ruN /usr/ports/devel/boehm-gc/files/patch-include-gc.h ./files/patch-include-gc.h
--- /usr/ports/devel/boehm-gc/files/patch-include-gc.h 2012-07-14 22:54:48.000000000 +0900
+++ ./files/patch-include-gc.h 1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@
---- include/gc.h.orig Wed Jun 4 17:07:33 2003
-+++ include/gc.h Wed May 12 20:03:22 2004
-@@ -487,6 +487,7 @@
- /* gcc knows how to retrieve return address, but we don't know */
- /* how to generate call stacks. */
- # define GC_RETURN_ADDR (GC_word)__builtin_return_address(0)
-+# define GC_RETURN_ADDR_PARENT (GC_word)__builtin_return_address(1)
- # else
- /* Just pass 0 for gcc compatibility. */
- # define GC_RETURN_ADDR 0
diff -ruN /usr/ports/devel/boehm-gc/files/patch-include-private-gcconfig.h ./files/patch-include-private-gcconfig.h
--- /usr/ports/devel/boehm-gc/files/patch-include-private-gcconfig.h 2012-07-14 22:54:48.000000000 +0900
+++ ./files/patch-include-private-gcconfig.h 1970-01-01 09:00:00.000000000 +0900
@@ -1,63 +0,0 @@
---- include/private/gcconfig.h.orig 2008-02-20 22:23:00.000000000 +0300
-+++ include/private/gcconfig.h 2009-10-20 01:08:38.000000000 +0400
-@@ -64,7 +64,7 @@
- /* Determine the machine type: */
- # if defined(__arm__) || defined(__thumb__)
- # define ARM32
--# if !defined(LINUX) && !defined(NETBSD)
-+# if !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD)
- # define NOSYS
- # define mach_type_known
- # endif
-@@ -334,10 +334,26 @@
- # define X86_64
- # define mach_type_known
- # endif
-+# if defined(__FreeBSD__) && defined(__amd64__)
-+# define X86_64
-+# define mach_type_known
-+# endif
-+# if defined(__FreeBSD__) && defined(__ia64__)
-+# define IA64
-+# define mach_type_known
-+# endif
- # if defined(FREEBSD) && defined(__sparc__)
- # define SPARC
- # define mach_type_known
- # endif
-+# if defined(FREEBSD) && defined(__powerpc__)
-+# define POWERPC
-+# define mach_type_known
-+# endif
-+# if defined(FREEBSD) && defined(__arm__)
-+# define ARM32
-+# define mach_type_known
-+# endif
- # if defined(bsdi) && (defined(i386) || defined(__i386__))
- # define I386
- # define BSDI
-@@ -1771,6 +1787,16 @@
- # define OS_TYPE "MSWINCE"
- # define DATAEND /* not needed */
- # endif
-+# ifdef FREEBSD
-+# define ALIGNMENT 4
-+# define OS_TYPE "FREEBSD"
-+# ifdef __ELF__
-+# define DYNAMIC_LOADING
-+# endif
-+# define HEURISTIC2
-+ extern char etext[];
-+# define SEARCH_FOR_DATA_START
-+# endif
- # ifdef NOSYS
- /* __data_start is usually defined in the target linker script. */
- extern int __data_start[];
-@@ -1800,6 +1826,7 @@
- # define OS_TYPE "MSWINCE"
- # define DATAEND /* not needed */
- # endif
-+ - # ifdef LINUX
- # define OS_TYPE "LINUX"
- # define LINUX_STACKBOTTOM
diff -ruN /usr/ports/devel/boehm-gc/files/patch-os_dep.c ./files/patch-os_dep.c
--- /usr/ports/devel/boehm-gc/files/patch-os_dep.c 2012-07-14 22:54:48.000000000 +0900
+++ ./files/patch-os_dep.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,44 +0,0 @@
---- os_dep.c.orig 2008-02-29 11:01:28.000000000 -0800
-+++ os_dep.c 2010-04-01 00:50:34.000000000 -0700
-@@ -816,7 +816,7 @@
- || defined(HURD) || defined(NETBSD)
- static struct sigaction old_segv_act;
- # if defined(_sigargs) /* !Irix6.x */ || defined(HPUX) \
-- || defined(HURD) || defined(NETBSD)
-+ || defined(HURD) || defined(NETBSD) || defined(FREEBSD)
- static struct sigaction old_bus_act;
- # endif
- # else
-@@ -826,7 +826,7 @@
- void GC_set_and_save_fault_handler(handler h)
- {
- # if defined(SUNOS5SIGS) || defined(IRIX5) \
-- || defined(OSF1) || defined(HURD) || defined(NETBSD)
-+ || defined(OSF1) || defined(HURD) || defined(NETBSD) || defined(FREEBSD)
- struct sigaction act;
- - act.sa_handler = h;
-@@ -846,7 +846,7 @@
- # else
- (void) sigaction(SIGSEGV, &act, &old_segv_act);
- # if defined(IRIX5) && defined(_sigargs) /* Irix 5.x, not 6.x */ \
-- || defined(HPUX) || defined(HURD) || defined(NETBSD)
-+ || defined(HPUX) || defined(HURD) || defined(NETBSD) || defined(FREEBSD)
- /* Under Irix 5.x or HP/UX, we may get SIGBUS. */
- /* Pthreads doesn't exist under Irix 5.x, so we */
- /* don't have to worry in the threads case. */
-@@ -2713,7 +2713,13 @@
- # include <errno.h>
- # if defined(FREEBSD)
- # define SIG_OK TRUE
--# define CODE_OK (code == BUS_PAGE_FAULT)
-+# if defined(POWERPC)
-+# define AIM /* Pretend that we're AIM. */
-+# include <machine/trap.h>
-+# define CODE_OK (code == EXC_DSI)
-+# else
-+# define CODE_OK (code == BUS_PAGE_FAULT)
-+# endif
- # elif defined(OSF1)
- # define SIG_OK (sig == SIGSEGV)
- # define CODE_OK (code == 2 /* experimentally determined */)
diff -ruN /usr/ports/devel/boehm-gc/pkg-plist ./pkg-plist
--- /usr/ports/devel/boehm-gc/pkg-plist 2012-07-14 22:54:48.000000000 +0900
+++ ./pkg-plist 2013-06-06 09:48:15.000000000 +0900
@@ -1,4 +1,5 @@
include/gc.h
+include/gc/cord.h
include/gc/gc.h
include/gc/gc_allocator.h
include/gc/gc_amiga_redirects.h
@@ -32,6 +33,7 @@
share/doc/gc/README.arm.cross
share/doc/gc/README.autoconf
share/doc/gc/README.changes
+share/doc/gc/README.cmake
share/doc/gc/README.contributors
share/doc/gc/README.cords
share/doc/gc/README.darwin
--- boehm-gc-7.2d.patch ends here ---
More information about the freebsd-ports
mailing list