FreeBSD Bugzilla – Attachment 155036 Details for
Bug 199055
lang/sbcl: upgrade to 1.2.10 and fix thread concurrency
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
lang-sbcl-1.2.10.patch
lang-sbcl-1.2.10.patch (text/plain), 20.79 KB, created by
Jack Carrozzo
on 2015-03-31 02:10:49 UTC
(
hide
)
Description:
lang-sbcl-1.2.10.patch
Filename:
MIME Type:
Creator:
Jack Carrozzo
Created:
2015-03-31 02:10:49 UTC
Size:
20.79 KB
patch
obsolete
>diff -ruN /usr/ports-head/lang/sbcl/Makefile /usr/ports/lang/sbcl/Makefile >--- /usr/ports-head/lang/sbcl/Makefile 2015-03-30 19:25:33.000000000 -0400 >+++ /usr/ports/lang/sbcl/Makefile 2015-03-30 21:12:08.000000000 -0400 >@@ -1,117 +1,133 @@ >-# $FreeBSD$ >+# $FreeBSD: head/lang/sbcl/Makefile 364741 2014-08-12 20:19:53Z olgeni $ > > PORTNAME= sbcl >-PORTVERSION= 1.2.9 >-PORTREVISION= 1 >+PORTVERSION= 1.2.10 > PORTEPOCH= 1 > CATEGORIES= lang lisp >-MASTER_SITES= SF/sbcl/sbcl/${PORTVERSION} LOCAL/marino:binaries >-DISTFILES= sbcl-${PORTVERSION}-source${EXTRACT_SUFX} \ >- sbcl-${PORTVERSION}-documentation-html${EXTRACT_SUFX} >+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ >+ ftp://ftp.SpringDaemons.com/soft/sbcl-binary/:binaries >+DISTFILES= \ >+ ${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} > >-MAINTAINER= ports@FreeBSD.org >+MAINTAINER= jack@crepinc.com > COMMENT= Common Lisp development system derived from the CMU CL system > > LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp > > USES= gmake tar:bzip2 > >-ONLY_FOR_ARCHS= i386 amd64 >-SBCL_HOME= ${PREFIX}/lib/sbcl >-MANUALS= asdf.html sbcl.html >-MODULESDOCS= asdf/README \ >- asdf/README.SBCL \ >- sb-aclrepl/README \ >- sb-bsd-sockets/FAQ \ >- sb-bsd-sockets/NEWS \ >- sb-md5/README \ >- sb-posix/README \ >- sb-rotate-byte/README \ >- sb-simple-streams/README >-TEXTDOCS= BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO >-CFLAGS+= -fno-omit-frame-pointer >-CPPFLAGS+= -I. -DSBCL_PREFIX=\\\"\$$(SBCL_PREFIX)\\\" >-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} \ >- --dynamic-space-size=${DYNAMIC_SPACE_SIZE} \ >- --with-sb-core-compression \ >- --with-sb-qshow >-NM?= /usr/bin/nm >-NMFLAGS?= -gp >+OPTIONS_DEFINE= SBCL THREADS > >-BOOT_ARCH_OS_LIST= 1.0.31-amd64-freebsd8 1.0.31-i386-freebsd8 \ >- 1.2.9-x86_64-dragonfly4 >+SBCL_DESC= Bootstrap with installed SBCL binary, if available >+THREADS_DESC= Experimental threading support > >-OPTIONS_DEFINE= SBCL #THREADS (don't build, see PR 184425) >-SBCL_DESC= Bootstrap with installed SBCL binary, if available >-THREADS_DESC= Experimental threading support >+CONTRIB_MODULES= 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 >+NEWBOOTNAME= ${PORTNAME}-${PORTVERSION}-${ARCH}-freebsd${OSREL:R} >+ONLY_FOR_ARCHS= i386 amd64 >+ONLY_FOR_ARCHS_REASON= is a native code compiler, and has not been ported to\ >+this architecture yet >+SBCL_HOME= ${PREFIX}/lib/sbcl > > .include <bsd.port.options.mk> > >-NEWBOOTNAME= sbcl-${PORTVERSION}-${ARCH}-${OPSYS:tl}${OSREL:R} >-PATTERN= *-${ARCH}-${OPSYS:tl}* >-# FreeBSD hack is to support legacy make, add unrelated core fix while here >-. if ${OPSYS} == FreeBSD >-CORE= sbcl.core >-BOOT_DISTNAME= sbcl-1.0.31-${ARCH}-freebsd8 >-. else # newer core format >-CORE= sbcl_core >-BOOT_DISTNAME= sbcl-${BOOT_ARCH_OS_LIST:M${PATTERN}} >-. endif >- >-.if make(makesum) >-. for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST} >-DISTFILES:= ${DISTFILES} sbcl-${BOOT_ARCH_OS}-binary.tar.bz2:binaries >-. endfor >-.else >-DISTFILES:= ${DISTFILES} ${BOOT_DISTNAME}-binary.tar.bz2:binaries >-.endif >+CFLAGS+= -fno-omit-frame-pointer >+CPPFLAGS+= -I. -DSBCL_PREFIX=\\\"\$$(SBCL_PREFIX)\\\" > > .if ${ARCH} == "i386" > DYNAMIC_SPACE_SIZE?= 512 > PLIST_SUB+= I386_ONLY="" AMD64_ONLY="@comment " >-SBCLCONFIG= Config.x86-${OPSYS:tl} >+SBCLCONFIG= Config.x86-freebsd > .else > DYNAMIC_SPACE_SIZE?= 1024 > PLIST_SUB+= I386_ONLY="@comment " AMD64_ONLY="" >-SBCLCONFIG= Config.x86-64-${OPSYS:tl} >+SBCLCONFIG= Config.x86-64-freebsd >+.endif >+ >+MAKE_SH_ARGS?= --prefix=${PREFIX} --dynamic-space-size=${DYNAMIC_SPACE_SIZE} \ >+--with-sb-core-compression --with-sb-qshow >+NM?= /usr/bin/nm >+NMFLAGS?= -gp >+ >+.if ${PORT_OPTIONS:MDOCS} || make(makesum) >+DISTFILES+= \ >+ ${PORTNAME}-${PORTVERSION}-documentation-html${EXTRACT_SUFX} >+MANUALS= asdf.html sbcl.html >+MODULESDOCS= asdf/README asdf/README.SBCL \ >+ sb-simple-streams/README \ >+ sb-mpfr/README.md \ >+ sb-gmp/README.md \ >+ sb-posix/README \ >+ sb-md5/README \ >+ sb-bsd-sockets/NEWS \ >+ sb-bsd-sockets/FAQ \ >+ sb-aclrepl/README \ >+ sb-rotate-byte/README \ >+ >+TEXTDOCS= BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO > .endif > > # If the SBCL option is enabled, try to use existing "sbcl" first: >-.if empty(PORT_OPTIONS:MSBCL) || !exists(${LOCALBASE}/bin/sbcl) >-XC_HOST?= ${WRKDIR}/${BOOT_DISTNAME}/src/runtime/sbcl \ >- --core ${WRKDIR}/${BOOT_DISTNAME}/output/${CORE} \ >- --dynamic-space-size ${DYNAMIC_SPACE_SIZE} \ >- --disable-debugger \ >- --userinit /dev/null \ >- --sysinit /dev/null >+.if empty(PORT_OPTIONS:MSBCL) || !exists(${LOCALBASE}/bin/sbcl) || make(makesum) >+BOOT_VERSION= 1.0.31 >+ >+. if make(makesum) >+BOOT_ARCH_OS_LIST= amd64-freebsd8 i386-freebsd8 >+. else >+. if ${OSREL:R} > 8 # We'll use 8.x bootstrap for now >+BOOT_ARCH_OS_LIST= ${ARCH}-freebsd8 >+. else >+BOOT_ARCH_OS_LIST= ${ARCH}-freebsd${OSREL:R} >+. endif >+. endif >+ >+. for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST} >+BOOT_DISTNAME= ${PORTNAME}-${BOOT_VERSION}-${BOOT_ARCH_OS} >+DISTFILES:= ${DISTFILES} ${BOOT_DISTNAME}-binary${EXTRACT_SUFX}:binaries >+. endfor >+ >+XC_HOST?= ${WRKDIR}/${BOOT_DISTNAME}/src/runtime/sbcl --core \ >+${WRKDIR}/${BOOT_DISTNAME}/output/sbcl.core \ >+--dynamic-space-size ${DYNAMIC_SPACE_SIZE} \ >+--disable-debugger --userinit /dev/null --sysinit /dev/null > MAKE_SH_ARGS+= --xc-host='${XC_HOST}' >+ > .endif # SBCL > > .if ${PORT_OPTIONS:MTHREADS} > MAKE_SH_ARGS+= --with-sb-thread >-. if defined(WITH_FUTEX) >+.if defined(WITH_FUTEX) > MAKE_SH_ARGS+= --with-sb-futex >-. else >+.else > MAKE_SH_ARGS+= --without-sb-futex >-. endif >-. if defined(WITH_SAFEPOINT) || defined(WITH_STRICT_SAFEPOINT) >+.endif >+.if defined(WITH_SAFEPOINT) || defined(WITH_STRICT_SAFEPOINT) > MAKE_SH_ARGS+= --with-sb-safepoint --with-sb-thruption --with-sb-wtimer >-. if defined(WITH_STRICT_SAFEPOINT) >+.if defined(WITH_STRICT_SAFEPOINT) > MAKE_SH_ARGS+= --with-sb-safepoint-strictly >-. else >+.else > MAKE_SH_ARGS+= --without-sb-safepoint-strictly >-. endif >-. else >-MAKE_SH_ARGS+= --without-sb-safepoint \ >- --without-sb-safepoint-strictly \ >- --without-sb-thruption \ >- --without-sb-wtimer >-. endif >+.endif >+.else >+MAKE_SH_ARGS+= --without-sb-safepoint --without-sb-safepoint-strictly \ >+ --without-sb-thruption --without-sb-wtimer >+.endif > .else > MAKE_SH_ARGS+= --without-sb-thread > .endif >@@ -139,11 +155,12 @@ > ${WRKSRC}/src/runtime/${SBCLCONFIG} > @${ECHO_CMD} "NM=${NM} ${NMFLAGS}" >> \ > ${WRKSRC}/src/runtime/${SBCLCONFIG} >- @${REINPLACE_CMD} -E -e 's,-lthr,-lpthread,g' \ >- ${WRKSRC}/src/runtime/${SBCLCONFIG} >+ @${REINPLACE_CMD} -E -e 's,-lthr,-pthread,g' \ >+ -e 's,-lpthread,-pthread,g' ${WRKSRC}/src/runtime/${SBCLCONFIG} > @${GREP} -Fe '.core' -l -r ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ >- -e 's|\.core|_core|g' >- @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \ >+ -e 's|\.core|_core|g' >+ @${REINPLACE_CMD} \ >+ -e 's|/usr/local|${PREFIX}|g' \ > ${WRKSRC}/doc/sbcl.1 > @${REINPLACE_CMD} -E -e 's!-sbcl-shared!& ${CFLAGS}!' \ > -e 's!\$$(TEST_FILESTEM|x|1)_core!$${\1}_core!g' \ >@@ -167,45 +184,40 @@ > ${WRKSRC}/release.sh \ > ${WRKSRC}/src/code/run-program.lisp \ > ${WRKSRC}/tests/run-compiler.sh >- @${FIND} ${WRKSRC} \( -name '*.orig' -o -name '*.bak' \) -delete > > do-build: >- (cd ${WRKSRC} && ${SETENV} CC="${CC}" ${SH} make.sh ${MAKE_SH_ARGS}) >- ${RM} -rf ${WRKSRC}/contrib/sb-cover/test-output >- ${REINPLACE_CMD} -E -e \ >+ @${FIND} ${WRKSRC} \( -name '*.orig' -o -name '*.bak' \) -delete >+ @(cd ${WRKSRC} && ${SETENV} CC="${CC}" ${SH} make.sh ${MAKE_SH_ARGS}) >+ @${RM} -rf ${WRKSRC}/contrib/sb-cover/test-output >+ @${REINPLACE_CMD} -E -e \ > 's|\$$Date\$$|'"`${SETENV} LANG=C /bin/date '+%B %d, %Y'`|g" \ > ${WRKSRC}/doc/sbcl.1 > > do-install: >- ${MKDIR} ${STAGEDIR}${SBCL_HOME}/contrib \ >- ${STAGEDIR}${SBCL_HOME}/site-systems >- ${INSTALL_PROGRAM} ${WRKSRC}/src/runtime/sbcl ${STAGEDIR}${PREFIX}/bin >- ${INSTALL_DATA} ${WRKSRC}/output/sbcl_core ${STAGEDIR}${SBCL_HOME} >- ${INSTALL_DATA} ${WRKSRC}/obj/sbcl-home/contrib/*.fasl \ >- ${STAGEDIR}${SBCL_HOME}/contrib/ >- ${INSTALL_DATA} ${WRKSRC}/obj/sbcl-home/contrib/*.asd \ >- ${STAGEDIR}${SBCL_HOME}/contrib/ >-.for MOD in ${CONMODULES} >+ ${MKDIR} ${STAGEDIR}${SBCL_HOME}/ >+ ${INSTALL_PROGRAM} ${WRKSRC}/src/runtime/sbcl ${STAGEDIR}${PREFIX}/bin/ >+ ${INSTALL_DATA} ${WRKSRC}/output/sbcl_core ${STAGEDIR}${SBCL_HOME}/ >+.for MOD in ${CONTRIB_MODULES} > ${MKDIR} ${STAGEDIR}${SBCL_HOME}/${MOD} >- - ${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.lisp \ >- ${STAGEDIR}${SBCL_HOME}/${MOD} >- - ${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.fasl \ >- ${STAGEDIR}${SBCL_HOME}/${MOD} >- - ${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/${MOD}.asd \ >- ${STAGEDIR}${SBCL_HOME}/${MOD} >+ (if test -f ${WRKSRC}/contrib/${MOD}/${MOD}.lisp; then ${INSTALL_DATA} \ >+ ${WRKSRC}/contrib/${MOD}/*.lisp ${STAGEDIR}${SBCL_HOME}/${MOD}/; fi) >+ (if test -f ${WRKSRC}/contrib/${MOD}/${MOD}.fasl; then ${INSTALL_DATA} \ >+ ${WRKSRC}/contrib/${MOD}/*.fasl ${STAGEDIR}${SBCL_HOME}/${MOD}/; fi) >+ (if test -f ${WRKSRC}/contrib/${MOD}/${MOD}.asd; then ${INSTALL_DATA} \ >+ ${WRKSRC}/contrib/${MOD}/${MOD}.asd ${STAGEDIR}${SBCL_HOME}/${MOD}/; fi) > .endfor > .if ${PORT_OPTIONS:MDOCS} > ${MKDIR} ${STAGEDIR}${DOCSDIR}/ >- ${INSTALL_DATA} ${MANUALS:S,^, ${WRKSRC}/doc/manual/,g} \ >- ${STAGEDIR}${DOCSDIR}/ >+ ${INSTALL_DATA} ${MANUALS:S,^, ${WRKSRC}/doc/manual/,g} ${STAGEDIR}${DOCSDIR}/ > ${INSTALL_DATA} ${TEXTDOCS:S,^,${WRKSRC}/,g} ${STAGEDIR}${DOCSDIR}/ > ${MKDIR} ${MODULESDOCS:C,/[^/]+$,,g:u:S,^,${STAGEDIR}${DOCSDIR}/,g} > . for MODDOC in ${MODULESDOCS} >- ${INSTALL_DATA} ${WRKSRC}/contrib/${MODDOC} \ >- ${STAGEDIR}${DOCSDIR}/${MODDOC} >+ ${INSTALL_DATA} ${WRKSRC}/contrib/${MODDOC} ${STAGEDIR}${DOCSDIR}/${MODDOC} > . endfor > .endif > ${INSTALL_MAN} ${WRKSRC}/doc/sbcl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 >+ ${MKDIR} ${STAGEDIR}${SBCL_HOME}/site-systems >+ @${TOUCH} ${STAGEDIR}${SBCL_HOME}/site-systems/.keep_me > > check regression-test test: build > (cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" ${SH} run-tests.sh) >diff -ruN /usr/ports-head/lang/sbcl/distinfo /usr/ports/lang/sbcl/distinfo >--- /usr/ports-head/lang/sbcl/distinfo 2015-03-30 19:25:33.000000000 -0400 >+++ /usr/ports/lang/sbcl/distinfo 2015-03-30 21:06:51.000000000 -0400 >@@ -1,10 +1,6 @@ >-SHA256 (sbcl-1.2.9-source.tar.bz2) = 603e15bf15b0fb644362864d3866e96a4c3328d88de1a7da09b26b4b3d089a5f >-SIZE (sbcl-1.2.9-source.tar.bz2) = 5518280 >-SHA256 (sbcl-1.2.9-documentation-html.tar.bz2) = d7a75b2e53f60117283fcc344c031b5060d5e1f5867f594287cce168f1021ac2 >-SIZE (sbcl-1.2.9-documentation-html.tar.bz2) = 214153 >+SHA256 (sbcl-1.2.10-source.tar.bz2) = 55243d5085278b7d0f80e5b91889f44ff66c195d801b3da26f1f4c696711f685 >+SIZE (sbcl-1.2.10-source.tar.bz2) = 5520417 >+SHA256 (sbcl-1.2.10-documentation-html.tar.bz2) = e9a61edaab73b8dd60e553fbaf717113d39a2a0f162c4975e939278775c2f8d9 >+SIZE (sbcl-1.2.10-documentation-html.tar.bz2) = 214434 > SHA256 (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 06a1e4e3a5f5f8e012ff6037a51624d7d1f34bff0979ce45e70418a293412b4e > SIZE (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 8397764 >-SHA256 (sbcl-1.0.31-i386-freebsd8-binary.tar.bz2) = fd2348749a2babf301a99449d246b349a1285fc0bca8b83bde0bfa7187cf3dd7 >-SIZE (sbcl-1.0.31-i386-freebsd8-binary.tar.bz2) = 8475244 >-SHA256 (sbcl-1.2.9-x86_64-dragonfly4-binary.tar.bz2) = 2e32a22ef3a528d7247c0e3a72a3ac672b8b6848ac2d35fbad52a3d1475130dc >-SIZE (sbcl-1.2.9-x86_64-dragonfly4-binary.tar.bz2) = 10224580 >diff -ruN /usr/ports-head/lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp /usr/ports/lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp >--- /usr/ports-head/lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp 2015-03-30 19:25:33.000000000 -0400 >+++ /usr/ports/lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp 1969-12-31 19:00:00.000000000 -0500 >@@ -1,11 +0,0 @@ >---- contrib/sb-concurrency/tests/test-frlock.lisp.orig 2015-02-27 19:49:46.000000000 +0900 >-+++ contrib/sb-concurrency/tests/test-frlock.lisp 2015-03-07 18:14:12.000000000 +0900 >-@@ -85,7 +85,7 @@ >- (values (cdr w-e!) (cdr r-e!)))) >- >- #+sb-thread >--(deftest* (frlock.1 :fails-on :win32) >-+(deftest* (frlock.1 :fails-on :(or :freebsd :win32)) >- (handler-case >- (sb-ext:with-timeout 60 (test-frlocks)) >- (sb-ext:timeout (c) >diff -ruN /usr/ports-head/lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-mailbox.lisp /usr/ports/lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-mailbox.lisp >--- /usr/ports-head/lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-mailbox.lisp 1969-12-31 19:00:00.000000000 -0500 >+++ /usr/ports/lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-mailbox.lisp 2015-03-30 20:47:42.000000000 -0400 >@@ -0,0 +1,11 @@ >+--- contrib/sb-concurrency/tests/test-mailbox.lisp.orig 2015-03-30 20:46:19.000000000 -0400 >++++ contrib/sb-concurrency/tests/test-mailbox.lisp 2015-03-30 19:59:00.000000000 -0400 >+@@ -196,7 +196,7 @@ >+ (:errors . 0) >+ (:timeouts . 0)) >+ >+-#-win32 >++#-(or win32 freebsd) >+ (deftest mailbox.multiple-producers-multiple-consumers >+ (test-mailbox-producers-consumers :n-senders 50 >+ :n-receivers 50 >diff -ruN /usr/ports-head/lang/sbcl/files/patch-contrib__sb-sprof__test.lisp /usr/ports/lang/sbcl/files/patch-contrib__sb-sprof__test.lisp >--- /usr/ports-head/lang/sbcl/files/patch-contrib__sb-sprof__test.lisp 2015-03-30 19:25:33.000000000 -0400 >+++ /usr/ports/lang/sbcl/files/patch-contrib__sb-sprof__test.lisp 1969-12-31 19:00:00.000000000 -0500 >@@ -1,14 +0,0 @@ >---- contrib/sb-sprof/test.lisp.orig 2015-02-27 19:49:46.000000000 +0900 >-+++ contrib/sb-sprof/test.lisp 2015-03-07 18:19:20.000000000 +0900 >-@@ -41,9 +41,9 @@ >- (loop while (< (get-universal-time) target) >- do (consalot))))) >- >--#-(or win32 darwin) ;not yet >-+#-(or win32 darwin freebsd) ;not yet >- (test) >--#-(or win32 darwin) ;not yet >-+#-(or win32 darwin freebsd) ;not yet >- (consing-test) >- >- ;; For debugging purposes, print output for visual inspection to see if >diff -ruN /usr/ports-head/lang/sbcl/files/patch-src__runtime__thread.c /usr/ports/lang/sbcl/files/patch-src__runtime__thread.c >--- /usr/ports-head/lang/sbcl/files/patch-src__runtime__thread.c 2015-03-30 19:25:33.000000000 -0400 >+++ /usr/ports/lang/sbcl/files/patch-src__runtime__thread.c 1969-12-31 19:00:00.000000000 -0500 >@@ -1,17 +0,0 @@ >---- src/runtime/thread.c.orig 2015-02-27 19:49:49.000000000 +0900 >-+++ src/runtime/thread.c 2015-03-07 18:27:45.000000000 +0900 >-@@ -520,10 +520,13 @@ >- stack_addr = pthread_get_stackaddr_np(os); >- stack_size = pthread_get_stacksize_np(os); >- #else >-- pthread_attr_t attr; >-+/* pthread_attr_t attr; >- int pthread_getattr_np(pthread_t, pthread_attr_t *); >- pthread_getattr_np(os, &attr); >- pthread_attr_getstack(&attr, &stack_addr, &stack_size); >-+*/ >-+ pthread_attr_getstackaddr(th->os_attr, &stack_addr); >-+ pthread_attr_getstacksize(th->os_attr, &stack_size); >- #endif >- >- th->control_stack_start = stack_addr; >diff -ruN /usr/ports-head/lang/sbcl/pkg-plist /usr/ports/lang/sbcl/pkg-plist >--- /usr/ports-head/lang/sbcl/pkg-plist 2015-03-30 19:25:33.000000000 -0400 >+++ /usr/ports/lang/sbcl/pkg-plist 2015-03-30 15:10:30.000000000 -0400 >@@ -1,145 +1,26 @@ > bin/sbcl > lib/sbcl/asdf/asdf.lisp > lib/sbcl/asdf/uiop.lisp >-lib/sbcl/contrib/asdf.fasl >-lib/sbcl/contrib/sb-aclrepl.asd >-lib/sbcl/contrib/sb-aclrepl.fasl >-lib/sbcl/contrib/sb-bsd-sockets.asd >-lib/sbcl/contrib/sb-bsd-sockets.fasl >-lib/sbcl/contrib/sb-cltl2.asd >-lib/sbcl/contrib/sb-cltl2.fasl >-lib/sbcl/contrib/sb-concurrency.asd >-lib/sbcl/contrib/sb-concurrency.fasl >-lib/sbcl/contrib/sb-cover.asd >-lib/sbcl/contrib/sb-cover.fasl >-lib/sbcl/contrib/sb-executable.asd >-lib/sbcl/contrib/sb-executable.fasl >-lib/sbcl/contrib/sb-gmp.asd >-lib/sbcl/contrib/sb-gmp.fasl >-lib/sbcl/contrib/sb-grovel.asd >-lib/sbcl/contrib/sb-grovel.fasl >-lib/sbcl/contrib/sb-introspect.asd >-lib/sbcl/contrib/sb-introspect.fasl >-lib/sbcl/contrib/sb-md5.asd >-lib/sbcl/contrib/sb-md5.fasl >-lib/sbcl/contrib/sb-mpfr.asd >-lib/sbcl/contrib/sb-mpfr.fasl >-lib/sbcl/contrib/sb-posix.asd >-lib/sbcl/contrib/sb-posix.fasl >-lib/sbcl/contrib/sb-queue.asd >-lib/sbcl/contrib/sb-queue.fasl >-lib/sbcl/contrib/sb-rotate-byte.asd >-lib/sbcl/contrib/sb-rotate-byte.fasl >-lib/sbcl/contrib/sb-rt.asd >-lib/sbcl/contrib/sb-rt.fasl >-lib/sbcl/contrib/sb-simple-streams.asd >-lib/sbcl/contrib/sb-simple-streams.fasl >-lib/sbcl/contrib/sb-sprof.asd >-lib/sbcl/contrib/sb-sprof.fasl >-lib/sbcl/contrib/uiop.fasl >-lib/sbcl/sb-aclrepl/debug.lisp >-lib/sbcl/sb-aclrepl/inspect.lisp >-lib/sbcl/sb-aclrepl/repl.lisp > lib/sbcl/sb-aclrepl/sb-aclrepl.asd >-lib/sbcl/sb-aclrepl/tests.lisp >-lib/sbcl/sb-aclrepl/toplevel.lisp >-lib/sbcl/sb-bsd-sockets/constants.lisp >-lib/sbcl/sb-bsd-sockets/defpackage.lisp >-lib/sbcl/sb-bsd-sockets/inet.lisp >-lib/sbcl/sb-bsd-sockets/inet4.lisp >-lib/sbcl/sb-bsd-sockets/inet6.lisp >-lib/sbcl/sb-bsd-sockets/local.lisp >-lib/sbcl/sb-bsd-sockets/misc.lisp >-lib/sbcl/sb-bsd-sockets/name-service.lisp >-lib/sbcl/sb-bsd-sockets/protocol.lisp > lib/sbcl/sb-bsd-sockets/sb-bsd-sockets.asd >-lib/sbcl/sb-bsd-sockets/sockets.lisp >-lib/sbcl/sb-bsd-sockets/sockopt.lisp >-lib/sbcl/sb-bsd-sockets/tests.lisp >-lib/sbcl/sb-bsd-sockets/util.lisp >-lib/sbcl/sb-bsd-sockets/win32-constants.lisp >-lib/sbcl/sb-bsd-sockets/win32-lib.lisp >-lib/sbcl/sb-bsd-sockets/win32-sockets.lisp >-lib/sbcl/sb-cltl2/compiler-let.lisp >-lib/sbcl/sb-cltl2/defpackage.lisp >-lib/sbcl/sb-cltl2/env.lisp >-lib/sbcl/sb-cltl2/macroexpand.lisp > lib/sbcl/sb-cltl2/sb-cltl2.asd >-lib/sbcl/sb-cltl2/tests.lisp >-lib/sbcl/sb-concurrency/frlock.lisp >-lib/sbcl/sb-concurrency/gate.lisp >-lib/sbcl/sb-concurrency/mailbox.lisp >-lib/sbcl/sb-concurrency/package.lisp >-lib/sbcl/sb-concurrency/queue.lisp > lib/sbcl/sb-concurrency/sb-concurrency.asd >-lib/sbcl/sb-cover/cover.lisp > lib/sbcl/sb-cover/sb-cover.asd >-lib/sbcl/sb-cover/test-data-1.lisp >-lib/sbcl/sb-cover/test-data-2.lisp >-lib/sbcl/sb-cover/test-data-3.lisp >-lib/sbcl/sb-cover/tests.lisp > lib/sbcl/sb-executable/sb-executable.lisp >-lib/sbcl/sb-gmp/bench.lisp >-lib/sbcl/sb-gmp/gmp.lisp > lib/sbcl/sb-gmp/sb-gmp.asd >-lib/sbcl/sb-gmp/tests-stress.lisp >-lib/sbcl/sb-gmp/tests.lisp >-lib/sbcl/sb-grovel/def-to-lisp.lisp >-lib/sbcl/sb-grovel/defpackage.lisp >-lib/sbcl/sb-grovel/example-constants.lisp >-lib/sbcl/sb-grovel/foreign-glue.lisp > lib/sbcl/sb-grovel/sb-grovel.asd >-lib/sbcl/sb-introspect/introspect.lisp >-lib/sbcl/sb-introspect/load-test.lisp > lib/sbcl/sb-introspect/sb-introspect.asd >-lib/sbcl/sb-introspect/test-driver.lisp >-lib/sbcl/sb-introspect/test.lisp >-lib/sbcl/sb-introspect/xref-test-data.lisp >-lib/sbcl/sb-introspect/xref-test.lisp >-lib/sbcl/sb-md5/md5-tests.lisp >-lib/sbcl/sb-md5/md5.lisp > lib/sbcl/sb-md5/sb-md5.asd >-lib/sbcl/sb-mpfr/mpfr.lisp > lib/sbcl/sb-mpfr/sb-mpfr.asd >-lib/sbcl/sb-mpfr/tests.lisp >-lib/sbcl/sb-posix/constants.lisp >-lib/sbcl/sb-posix/defpackage.lisp >-lib/sbcl/sb-posix/designator.lisp >-lib/sbcl/sb-posix/interface.lisp >-lib/sbcl/sb-posix/macros.lisp >-lib/sbcl/sb-posix/posix-tests.lisp > lib/sbcl/sb-posix/sb-posix.asd >-lib/sbcl/sb-queue/package.lisp > lib/sbcl/sb-queue/sb-queue.asd >-lib/sbcl/sb-rotate-byte/arm-vm.lisp >-lib/sbcl/sb-rotate-byte/compiler.lisp >-lib/sbcl/sb-rotate-byte/package.lisp >-lib/sbcl/sb-rotate-byte/ppc-vm.lisp >-lib/sbcl/sb-rotate-byte/rotate-byte-tests.lisp >-lib/sbcl/sb-rotate-byte/rotate-byte.lisp > lib/sbcl/sb-rotate-byte/sb-rotate-byte.asd >-lib/sbcl/sb-rotate-byte/x86-64-vm.lisp >-lib/sbcl/sb-rotate-byte/x86-vm.lisp >-lib/sbcl/sb-rt/rt.lisp > lib/sbcl/sb-rt/sb-rt.asd >-lib/sbcl/sb-simple-streams/classes.lisp >-lib/sbcl/sb-simple-streams/direct.lisp >-lib/sbcl/sb-simple-streams/file.lisp >-lib/sbcl/sb-simple-streams/fndb.lisp >-lib/sbcl/sb-simple-streams/impl.lisp >-lib/sbcl/sb-simple-streams/internal.lisp >-lib/sbcl/sb-simple-streams/iodefs.lisp >-lib/sbcl/sb-simple-streams/null.lisp >-lib/sbcl/sb-simple-streams/package.lisp > lib/sbcl/sb-simple-streams/sb-simple-streams.asd >-lib/sbcl/sb-simple-streams/simple-stream-tests.lisp >-lib/sbcl/sb-simple-streams/socket.lisp >-lib/sbcl/sb-simple-streams/strategy.lisp >-lib/sbcl/sb-simple-streams/string.lisp >-lib/sbcl/sb-simple-streams/terminal.lisp > lib/sbcl/sb-sprof/sb-sprof.lisp > lib/sbcl/sb-sprof/test.lisp > lib/sbcl/sbcl_core >+lib/sbcl/site-systems/.keep_me > man/man1/sbcl.1.gz > %%PORTDOCS%%%%DOCSDIR%%/BUGS > %%PORTDOCS%%%%DOCSDIR%%/COPYING >@@ -154,9 +35,10 @@ > %%PORTDOCS%%%%DOCSDIR%%/sb-aclrepl/README > %%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/FAQ > %%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/NEWS >+%%PORTDOCS%%%%DOCSDIR%%/sb-gmp/README.md > %%PORTDOCS%%%%DOCSDIR%%/sb-md5/README >+%%PORTDOCS%%%%DOCSDIR%%/sb-mpfr/README.md > %%PORTDOCS%%%%DOCSDIR%%/sb-posix/README > %%PORTDOCS%%%%DOCSDIR%%/sb-rotate-byte/README > %%PORTDOCS%%%%DOCSDIR%%/sb-simple-streams/README > %%PORTDOCS%%%%DOCSDIR%%/sbcl.html >-@dir lib/sbcl/site-systems
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 199055
: 155036