Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

devel/boehm-gc updated with Capable VMs bdwgc Morello port #151

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions devel/boehm-gc/Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
PORTNAME= gc
DISTVERSION= 8.2.4
DISTVERSION= 8.3.0
CATEGORIES= devel
MASTER_SITES= http://www.hboehm.info/gc/gc_source/ \
https://github.com/ivmai/bdwgc/releases/download/v${PORTVERSION}/
DISTNAME= bdwgc
EXTRACT_SUFX= .tar.gz
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}

USE_GITHUB= yes
GH_ACCOUNT= capablevms
GH_PROJECT= bdwgc
GH_TAGNAME= df6a3b7

PKGNAMEPREFIX= boehm-
.ifdef GC_VARIANT
PKGNAMESUFFIX= -${GC_VARIANT}
.endif

MAINTAINER= yasu@FreeBSD.org
COMMENT= Garbage collection and memory leak detection for C and C++
MAINTAINER= dejice.jacob@glasgow.ac.uk
COMMENT= Garbage collection and memory leak detection for C, with CHERI purecap support
WWW= https://www.hboehm.info/gc/

LICENSE= BDWGC
Expand All @@ -19,7 +26,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops

USES= cpe libtool pathfix pkgconfig
USES= autoreconf
CPE_VENDOR= boehm-demers-weiser
CPE_PRODUCT= garbage_collector
USE_LDCONFIG= yes
Expand All @@ -34,8 +41,6 @@ MAKE_JOBS_UNSAFE= yes
INSTALL_TARGET= install-strip
TEST_TARGET= check

WRKSRC= ${WRKDIR}/${DISTNAME:C/[a-z]$//}

OPTIONS_DEFINE= DEBUG

.ifdef GC_VARIANT
Expand All @@ -56,7 +61,7 @@ PLIST_FILES= ${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \
${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \
${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.5.2,} \
${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.5.1,} \
${GCTBALIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \
${GCTBALIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
${GCTBALIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
Expand Down Expand Up @@ -86,11 +91,6 @@ PARALLEL_MARK_CONFIGURE_WITH= --enable-parallel-mark

.ifdef GC_VARIANT
post-patch:
@${REINPLACE_CMD} -e \
's,libcord\.la,libcord-${GC_VARIANT}.la,g ; \
s,libgc\.la,libgc-${GC_VARIANT}.la,g ; \
s,libgccpp\.la,libgccpp-${GC_VARIANT}.la,g ; \
s,libgctba\.la,libgctba-${GC_VARIANT}.la,g' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e \
's,-lgc,-lgc-${GC_VARIANT},' ${WRKSRC}/bdw-gc.pc.in

Expand All @@ -103,16 +103,13 @@ post-install:
${STAGEDIR}${PREFIX}/include/gc
. endif
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcord-${GC_VARIANT}.so.1.5.0
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgc-${GC_VARIANT}.so.1.5.2
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgc-${GC_VARIANT}.so.1.5.1
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgccpp-${GC_VARIANT}.so.1.5.0
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgctba-${GC_VARIANT}.so.1.5.0

.else # ! GC_VARIANT
post-patch:
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/gc.man
@${REINPLACE_CMD} \
-e "s|(datadir)/@PACKAGE@|(datadir)/doc/@PACKAGE@|" \
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/gc.man

post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
Expand Down
1 change: 0 additions & 1 deletion devel/boehm-gc/Makefile.purecap

This file was deleted.

6 changes: 3 additions & 3 deletions devel/boehm-gc/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1685552073
SHA256 (gc-8.2.4.tar.gz) = 3d0d3cdbe077403d3106bb40f0cbb563413d6efdbb2a7e1cd6886595dec48fc2
SIZE (gc-8.2.4.tar.gz) = 1210929
TIMESTAMP = 1709919906
SHA256 (capablevms-bdwgc-8.3.0-df6a3b7_GH0.tar.gz) = 212dda624cf7fe06a1866aacb8d35c528817c06db6e25b8ff501997a1a427504
SIZE (capablevms-bdwgc-8.3.0-df6a3b7_GH0.tar.gz) = 834896
51 changes: 0 additions & 51 deletions devel/boehm-gc/files/patch-doc_gc.man

This file was deleted.

2 changes: 1 addition & 1 deletion devel/boehm-gc/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ lib/libcord.so.1.5.0
lib/libgc.a
lib/libgc.so
lib/libgc.so.1
lib/libgc.so.1.5.2
lib/libgc.so.1.5.1
lib/libgccpp.a
lib/libgccpp.so
lib/libgccpp.so.1
Expand Down