On 2013/05/30 09:10, Kurt Miller wrote:
> On Friday 22 March 2013 10:03:14 pm Kurt Miller wrote:
> > On 03/22/13 08:35, Stuart Henderson wrote:
> > > On 2013/03/21 22:01, Kurt Miller wrote:
> > >> I stalled on submitting them with upstream. I ran into a snafu. However,
> > >> I
> > >> do have an update for boehm-gc that can be tested. There's one i386
> > >> machine in my cluster that doesn't behave which is one of the reasons
> > >> I haven't moved this forward yet. It is on my todo list which I'm
> > >> chipping
> > >> away at little by little.
> > >
> > > Regression tests all pass on macppc, i386, amd64, and I've tried w3m
> > > a bit on these 3 arches (w3m has had problems in the past even though
> > > regression tests were all OK); no problems noted there.
> > >
> > > It would be good if someone could do similar tests on other arch,
> > > in particular hppa if it hasn't already been tested.
> > >
> >
> > Thanks Stuart. I sent the diff before I reviewed the old patches and
> > I removed two patches that should stay:
> >
> > patch-bdw-gc_pc_in
> > patch-doc_gc_man
> >
> > Well actually the gc man patch needs to be updated since it refers to
> > header file that no longer exists. I'll send a new revision when I
> > get back from a short family vacation.
>
> [redirecting from tech@]
>
> The only difference in this update from the one I posted back in March
> is that I kept patch-bdw-gc_pc_in which includes -pthread in Libs. The
> man page diff is not needed anymore since gc_cpp.h is gone and there's
> nothing special about OpenBSD's port that needs to be called out, IMO.
No problems seen so far on i386/amd64/sparc64/macppc.
Here's a diff relative to yours to add c++ support, which is no longer
enabled by default, unbreaking graphics/asymptote. (SHARED_LIBS lines
pasted directly from shared_libs.log).
I've also moved PFRAG.shared-main into PLIST-main now that pkg_create
can handle this.
diff --git Makefile Makefile
index 7211e19..74b7863 100644
--- Makefile
+++ Makefile
@@ -11,8 +11,9 @@ PKGNAME-main= boehm-gc-${VERSION}
WRKDIST= ${WRKDIR}/gc-7.2
MULTI_PACKAGES= -main -atomic
-SHARED_LIBS += gc 3.0 # .1.2
-SHARED_LIBS += cord 2.3 # .1.3
+SHARED_LIBS += gc 3.0 # 1.3
+SHARED_LIBS += gccpp 0.0 # 1.3
+SHARED_LIBS += cord 2.3 # 1.3
CATEGORIES= devel
@@ -39,6 +40,7 @@ AUTOCONF_VERSION= 2.68
CONFIGURE_STYLE= autoconf no-autoheader
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
+ --enable-cplusplus \
--enable-threads=pthreads
pre-configure:
diff --git pkg/PFRAG.shared-main pkg/PFRAG.shared-main
deleted file mode 100644
index 2e2b55b..0000000
--- pkg/PFRAG.shared-main
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.1 2008/07/01 09:43:19 landry Exp $
-@lib lib/libcord.so.${LIBcord_VERSION}
-@lib lib/libgc.so.${LIBgc_VERSION}
diff --git pkg/PLIST-main pkg/PLIST-main
index 834b7ad..4d1a104 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.1 2008/07/01 09:43:19 landry Exp $
@pkgpath devel/boehm-gc
-%%SHARED%%
include/gc/
include/gc.h
include/gc/cord.h
@@ -9,6 +8,7 @@ include/gc/gc_allocator.h
include/gc/gc_amiga_redirects.h
include/gc/gc_backptr.h
include/gc/gc_config_macros.h
+include/gc/gc_cpp.h
include/gc/gc_gcj.h
include/gc/gc_inline.h
include/gc/gc_mark.h
@@ -19,10 +19,16 @@ include/gc/gc_version.h
include/gc/leak_detector.h
include/gc/new_gc_alloc.h
include/gc/weakpointer.h
+include/gc_cpp.h
lib/libcord.a
lib/libcord.la
+@lib lib/libcord.so.${LIBcord_VERSION}
lib/libgc.a
lib/libgc.la
+@lib lib/libgc.so.${LIBgc_VERSION}
+lib/libgccpp.a
+lib/libgccpp.la
+@lib lib/libgccpp.so.${LIBgccpp_VERSION}
lib/pkgconfig/
lib/pkgconfig/bdw-gc.pc
@man man/man3/GC_enable_incremental.3
