diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile index da80ec8b76a2..34052fefc3cd 100644 --- a/lang/sbcl/Makefile +++ b/lang/sbcl/Makefile @@ -1,182 +1,182 @@ # All *-sbcl ports and any other port with SBCL fasl files must get a # PORTREVISION bump when lang/sbcl is updated. The compiled fasl files are # pinned to exact versions of everything used to build them. PORTNAME= sbcl DISTVERSION= 2.2.7 DISTVERSIONSUFFIX= -source -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= lang lisp MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \ SF/${PORTNAME}/${PORTNAME}/${BOOTVERSION}:binaries DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= krion@FreeBSD.org COMMENT= Common Lisp development system derived from the CMU CL system LICENSE= BSD2CLAUSE PD LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr RUN_DEPENDS= cl-asdf>=0:devel/cl-asdf USES= gmake makeinfo tar:bzip2 SUB_FILES= pkg-message sbclrc WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PORTDOCS= * # All options explained into file: ${WRKSRC}/base-target-features.lisp-expr OPTIONS_DEFINE= COMPRESSION DOCS LINKABLE_RUNTIME QSHOW SAFEPOINT SIMD \ THREADS UNICODE XREF OPTIONS_DEFAULT= SBCL THREADS UNICODE OPTIONS_SINGLE= BOOTSTRAP OPTIONS_SINGLE_BOOTSTRAP= ABCL CCL CMUCL SBCL OPTIONS_EXCLUDE= ABCL CMUCL ABCL_DESC= Armed Bear Common Lisp BOOTSTRAP_DESC= Supported languages of the build host CCL_DESC= Clozure Common Lisp CMUCL_DESC= Carnegie Mellon University Common Lisp COMPRESSION_DESC= Enable core compression LINKABLE_RUNTIME_DESC= Enable SB-LINKABLE-RUNTIME feature (experimental) QSHOW_DESC= C runtime with low-level debugging output SAFEPOINT_DESC= Using safepoints instead of signals SBCL_DESC= Steel Bank Common Lisp SIMD_DESC= Enable SB-SIMD (requires CPUs supporting AVX2) XREF_DESC= XREF data for SBCL internals ABCL_BUILD_DEPENDS= abcl:lang/abcl ABCL_VARS= XC_HOST="abcl" CCL_BUILD_DEPENDS= ccl:lang/ccl CCL_VARS= XC_HOST="ccl --no-init --batch --quiet" CMUCL_BUILD_DEPENDS= lisp:lang/cmucl CMUCL_VARS= XC_HOST="lisp -nositeinit -noinit -batch -quiet" COMPRESSION_LIB_DEPENDS= libzstd.so:archivers/zstd COMPRESSION_USES= localbase:ldflags COMPRESSION_VARS= MAKE_SH_ARGS+="--with-sb-core-compression" COMPRESSION_VARS_OFF= MAKE_SH_ARGS+="--without-sb-core-compression" DOCS_VARS= INFO="asdf sbcl" LINKABLE_RUNTIME_VARS= MAKE_SH_ARGS+="--with-sb-linkable-runtime" LINKABLE_RUNTIME_VARS_OFF= MAKE_SH_ARGS+="--without-sb-linkable-runtime" QSHOW_VARS= MAKE_SH_ARGS+="--with-sb-qshow" QSHOW_VARS_OFF= MAKE_SH_ARGS+="--without-sb-qshow" SAFEPOINT_IMPLIES= THREADS SAFEPOINT_VARS= MAKE_SH_ARGS+="--with-sb-safepoint --with-sb-thruption --with-sb-wtimer" SAFEPOINT_VARS_OFF= MAKE_SH_ARGS+="--without-sb-safepoint --without-sb-thruption --without-sb-wtimer" SBCL_DISTFILES= ${PORTNAME}-${SBCL_BOOT_LIST:M${ARCHOS_PATTERN}}-binary${EXTRACT_SUFX}:binaries SBCL_VARS= XC_HOST="${BOOT_WRKSRC}/src/runtime/sbcl --core ${BOOT_WRKSRC}/output/sbcl.core --noinform --disable-debugger --no-sysinit --no-userinit" SIMD_VARS= MAKE_SH_ARGS+="--with-sb-simd" SIMD_VARS_OFF= MAKE_SH_ARGS+="--without-sb-simd" THREADS_VARS= MAKE_SH_ARGS+="--with-sb-thread" THREADS_VARS_OFF= MAKE_SH_ARGS+="--without-sb-thread" UNICODE_VARS= MAKE_SH_ARGS+="--with-sb-unicode" UNICODE_VARS_OFF= MAKE_SH_ARGS+="--without-sb-unicode" XREF_VARS= MAKE_SH_ARGS+="--with-sb-xref-for-internals" XREF_VARS_OFF= MAKE_SH_ARGS+="--without-sb-xref-for-internals" BOOTVERSION= 1.2.7 CONMODULES= asdf sb-aclrepl sb-bsd-sockets sb-cltl2 sb-concurrency sb-cover \ sb-executable sb-gmp sb-grovel sb-introspect sb-md5 sb-mpfr \ sb-posix sb-queue sb-rotate-byte sb-rt sb-simple-streams \ sb-sprof MAKE_SH_ARGS?= --prefix="${PREFIX}" --xc-host="${XC_HOST}" # You can use the DYNAMIC_SPACE_SIZE knob to change the size of SBCL dynamically-allocated memory. # Default for arch: i386 = 512Mb, amd64 = 1Gb. .if defined(DYNAMIC_SPACE_SIZE) MAKE_SH_ARGS+= --dynamic-space-size=${DYNAMIC_SPACE_SIZE} .endif SBCL_BOOT_LIST= ${BOOTVERSION}-x86-64-freebsd ${BOOTVERSION}-x86-freebsd \ ${BOOTVERSION}-x86-64-dragonfly .include ARCHOS_PATTERN= *-${ARCH:S/amd64/x86-64/:S/i386/x86/}-${OPSYS:tl}* BOOT_WRKSRC= ${WRKDIR}/${PORTNAME}-${SBCL_BOOT_LIST:M${ARCHOS_PATTERN}} .if ${PORT_OPTIONS:MLINKABLE_RUNTIME} PLIST_SUB+= LINKABLE_RUNTIME="" .else PLIST_SUB+= LINKABLE_RUNTIME="@comment " .endif .if ${PORT_OPTIONS:MSIMD} PLIST_SUB+= SIMD="" .else PLIST_SUB+= SIMD="@comment " .endif # for port maintenance, invoke "make makesum PLUS_BOOTSTRAPS=1" .if defined (PLUS_BOOTSTRAPS) . for B in ${SBCL_BOOT_LIST} . if !${DISTFILES:Msbcl-${B}-*} DISTFILES:= ${DISTFILES} \ ${PORTNAME}-${B}-binary${EXTRACT_SUFX}:binaries . endif . endfor .endif post-patch: @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \ ${WRKSRC}/src/code/toplevel.lisp \ ${WRKSRC}/doc/${PORTNAME}.1 \ ${WRKSRC}/doc/manual/start-stop.texinfo do-build: - (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LINKFLAGS="${LDFLAGS}" ${SH} make.sh ${MAKE_SH_ARGS}) + (cd ${WRKSRC} && ${SH} make.sh ${MAKE_SH_ARGS}) post-build-DOCS-on: ${DO_MAKE_BUILD} -C ${WRKSRC}/doc/manual info html do-install: (cd ${WRKSRC} && ${SETENV} \ INSTALL_ROOT="${STAGEDIR}${PREFIX}" \ MAN_DIR="${STAGEDIR}${MANPREFIX}/man" \ INFO_DIR="${STAGEDIR}${PREFIX}/${INFO_PATH}" \ DOC_DIR="${STAGEDIR}${DOCSDIR}" \ SBCL_HOME="" \ ${SH} install.sh) .for M in ${CONMODULES} ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${M} ${INSTALL_DATA} ${WRKSRC}/contrib/${M}/*.[la]* \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${M}/ .endfor .if ${PORT_OPTIONS:MSIMD} # sb-simd has its code in './code' ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/sb-simd ${INSTALL_DATA} ${WRKSRC}/contrib/sb-simd/code/*.[la]* \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/sb-simd/ .endif ${INSTALL_DATA} ${WRKDIR}/sbclrc ${STAGEDIR}${PREFIX}/etc/sbclrc.sample post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} post-install-DOCS-on: ${RM} ${STAGEDIR}${PREFIX}/${INFO_PATH}/dir # don't requered with INFO= ${RM} -r ${STAGEDIR}${DOCSDIR}/html # empty directory created by install.sh check regression-test test: build (cd ${WRKSRC}/tests && ${SH} run-tests.sh) .include diff --git a/lang/sbcl/files/patch-src_runtime_Config.x86-64-freebsd b/lang/sbcl/files/patch-src_runtime_Config.x86-64-freebsd new file mode 100644 index 000000000000..43b2a9d39cec --- /dev/null +++ b/lang/sbcl/files/patch-src_runtime_Config.x86-64-freebsd @@ -0,0 +1,20 @@ +From 9de74a0d4d0f1f38db5ae7e891480d8a4b4ad8d9 Mon Sep 17 00:00:00 2001 +From: Douglas Katzman +Date: Tue, 2 Aug 2022 14:40:28 -0400 +Subject: [PATCH] Add /usr/local/include for freebsd + +https://wiki.freebsd.org/WarnerLosh/UsrLocal says something about it. + +Should fix lp#1981112. +--- src/runtime/Config.x86-64-freebsd.orig 2022-07-29 14:39:18 UTC ++++ src/runtime/Config.x86-64-freebsd +@@ -15,7 +15,8 @@ include Config.x86-64-bsd + # worked fine for most things, but LOAD-FOREIGN & friends require + # dlopen() etc., which in turn depend on dynamic linking of the + # runtime. +-OS_LIBS += -lutil ++OS_LIBS += -lutil -L/usr/local/lib ++CPPFLAGS += -isystem/usr/local/include + + # use libthr (1:1 threading). libpthread (m:n threading) does not work. + ifdef LISP_FEATURE_SB_THREAD diff --git a/lang/sbcl/files/patch-src_runtime_stringspace.c b/lang/sbcl/files/patch-src_runtime_stringspace.c new file mode 100644 index 000000000000..f4c0fd029b64 --- /dev/null +++ b/lang/sbcl/files/patch-src_runtime_stringspace.c @@ -0,0 +1,16 @@ +From 48d686f9718f98122547a9006c871cfcd50439ab Mon Sep 17 00:00:00 2001 +From: Douglas Katzman +Date: Sun, 31 Jul 2022 21:38:19 -0400 +Subject: [PATCH] Accept that value-cell-value can move to R/O space + +Fixes lp#1983218 +--- src/runtime/stringspace.c.orig 2022-07-29 14:39:18 UTC ++++ src/runtime/stringspace.c +@@ -76,6 +76,7 @@ static void visit_pointer_words(lispobj* object, lispo + widetag == RATIO_WIDETAG || widetag == COMPLEX_WIDETAG || + widetag == SIMPLE_ARRAY_WIDETAG || + (widetag >= COMPLEX_BASE_STRING_WIDETAG && widetag <= COMPLEX_ARRAY_WIDETAG) || ++ widetag == VALUE_CELL_WIDETAG || + widetag == WEAK_POINTER_WIDETAG) { + int len = object_size(object), i; + for (i=1; i +Date: Sun, 31 Jul 2022 21:38:19 -0400 +Subject: [PATCH] Accept that value-cell-value can move to R/O space + +Fixes lp#1983218 +--- tests/save1.test.sh.orig 2022-07-29 14:39:18 UTC ++++ tests/save1.test.sh +@@ -23,6 +23,11 @@ run_sbcl <