Attachment #155036 for bug #199055

View | Details | Raw Unified | Return to bug 199055
Collapse All | Expand All




# $FreeBSD: head/lang/sbcl/Makefile 364741 2014-08-12 20:19:53Z olgeni $

PORTNAME=	sbcl
PORTVERSION=	1.2.10
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	lang lisp
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
		ftp://ftp.SpringDaemons.com/soft/sbcl-binary/:binaries
DISTFILES=	\
	${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX}

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

OPTIONS_DEFINE=		SBCL THREADS
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

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>

CFLAGS+=	-fno-omit-frame-pointer
CPPFLAGS+=	-I. -DSBCL_PREFIX=\\\"\$$(SBCL_PREFIX)\\\"
# 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

.if ${ARCH} == "i386"
DYNAMIC_SPACE_SIZE?=	512
PLIST_SUB+=	I386_ONLY="" AMD64_ONLY="@comment "
SBCLCONFIG=	 Config.x86-freebsd
.else
DYNAMIC_SPACE_SIZE?=	1024
PLIST_SUB+=	I386_ONLY="@comment " AMD64_ONLY=""
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) || 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)
MAKE_SH_ARGS+=	--with-sb-futex
.else
MAKE_SH_ARGS+=	--without-sb-futex
.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)
MAKE_SH_ARGS+=	--with-sb-safepoint-strictly
.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
		--without-sb-wtimer
. endif
.else
MAKE_SH_ARGS+=	--without-sb-thread
.endif

		${WRKSRC}/src/runtime/${SBCLCONFIG}
	@${ECHO_CMD} "NM=${NM} ${NMFLAGS}" >> \
		${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' \
		${WRKSRC}/doc/sbcl.1
	@${REINPLACE_CMD} -E -e 's!-sbcl-shared!& ${CFLAGS}!' \
		-e 's!\$$(TEST_FILESTEM|x|1)_core!$${\1}_core!g' \

		${WRKSRC}/release.sh \
		${WRKSRC}/src/code/run-program.lisp \
		${WRKSRC}/tests/run-compiler.sh
	@${FIND} ${WRKSRC} \( -name '*.orig' -o -name '*.bak' \) -delete

do-build:
	@${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}/
	${INSTALL_PROGRAM} ${WRKSRC}/src/runtime/sbcl ${STAGEDIR}${PREFIX}/bin/
	${INSTALL_DATA} ${WRKSRC}/output/sbcl_core ${STAGEDIR}${SBCL_HOME}/
.for MOD in ${CONTRIB_MODULES}
	${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}/${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}/
		${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}
		${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)

Lines 1-10 Link Here

(-)/usr/ports/lang/sbcl/distinfo (-8 / +4 lines)
1	SHA256 (sbcl-1.2.9-source.tar.bz2) = 603e15bf15b0fb644362864d3866e96a4c3328d88de1a7da09b26b4b3d089a5f	1	SHA256 (sbcl-1.2.10-source.tar.bz2) = 55243d5085278b7d0f80e5b91889f44ff66c195d801b3da26f1f4c696711f685
2	SIZE (sbcl-1.2.9-source.tar.bz2) = 5518280	2	SIZE (sbcl-1.2.10-source.tar.bz2) = 5520417
3	SHA256 (sbcl-1.2.9-documentation-html.tar.bz2) = d7a75b2e53f60117283fcc344c031b5060d5e1f5867f594287cce168f1021ac2	3	SHA256 (sbcl-1.2.10-documentation-html.tar.bz2) = e9a61edaab73b8dd60e553fbaf717113d39a2a0f162c4975e939278775c2f8d9
4	SIZE (sbcl-1.2.9-documentation-html.tar.bz2) = 214153	4	SIZE (sbcl-1.2.10-documentation-html.tar.bz2) = 214434
5	SHA256 (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 06a1e4e3a5f5f8e012ff6037a51624d7d1f34bff0979ce45e70418a293412b4e	5	SHA256 (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 06a1e4e3a5f5f8e012ff6037a51624d7d1f34bff0979ce45e70418a293412b4e
6	SIZE (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 8397764	6	SIZE (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 8397764
7	SHA256 (sbcl-1.0.31-i386-freebsd8-binary.tar.bz2) = fd2348749a2babf301a99449d246b349a1285fc0bca8b83bde0bfa7187cf3dd7
8	SIZE (sbcl-1.0.31-i386-freebsd8-binary.tar.bz2) = 8475244
9	SHA256 (sbcl-1.2.9-x86_64-dragonfly4-binary.tar.bz2) = 2e32a22ef3a528d7247c0e3a72a3ac672b8b6848ac2d35fbad52a3d1475130dc
10	SIZE (sbcl-1.2.9-x86_64-dragonfly4-binary.tar.bz2) = 10224580

Lines 1-11 Link Here

(-)/usr/ports/lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp (-11 lines)
1	--- contrib/sb-concurrency/tests/test-frlock.lisp.orig 2015-02-27 19:49:46.000000000 +0900
2	+++ contrib/sb-concurrency/tests/test-frlock.lisp 2015-03-07 18:14:12.000000000 +0900
3	@@ -85,7 +85,7 @@
4	(values (cdr w-e!) (cdr r-e!))))
5
6	#+sb-thread
7	-(deftest* (frlock.1 :fails-on :win32)
8	+(deftest* (frlock.1 :fails-on :(or :freebsd :win32))
9	(handler-case
10	(sb-ext:with-timeout 60 (test-frlocks))
11	(sb-ext:timeout (c)

Line 0 Link Here

(-)/usr/ports/lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-mailbox.lisp (+11 lines)
	1	--- contrib/sb-concurrency/tests/test-mailbox.lisp.orig 2015-03-30 20:46:19.000000000 -0400
	2	+++ contrib/sb-concurrency/tests/test-mailbox.lisp 2015-03-30 19:59:00.000000000 -0400
	3	@@ -196,7 +196,7 @@
	4	(:errors . 0)
	5	(:timeouts . 0))
	6
	7	-#-win32
	8	+#-(or win32 freebsd)
	9	(deftest mailbox.multiple-producers-multiple-consumers
	10	(test-mailbox-producers-consumers :n-senders 50
	11	:n-receivers 50




--- 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




--- 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;




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

%%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

Return to bug 199055

Lines 1-117 Link Here

(-)/usr/ports/lang/sbcl/Makefile (-105 / +117 lines)
1	# $FreeBSD$	1	# $FreeBSD: head/lang/sbcl/Makefile 364741 2014-08-12 20:19:53Z olgeni $
2		2
3	PORTNAME= sbcl	3	PORTNAME= sbcl
4	PORTVERSION= 1.2.9	4	PORTVERSION= 1.2.10
5	PORTREVISION= 1
6	PORTEPOCH= 1	5	PORTEPOCH= 1
7	CATEGORIES= lang lisp	6	CATEGORIES= lang lisp
8	MASTER_SITES= SF/sbcl/sbcl/${PORTVERSION} LOCAL/marino:binaries	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
9	DISTFILES= sbcl-${PORTVERSION}-source${EXTRACT_SUFX} \	8	ftp://ftp.SpringDaemons.com/soft/sbcl-binary/:binaries
10	sbcl-${PORTVERSION}-documentation-html${EXTRACT_SUFX}	9	DISTFILES= \
		10	${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX}
11		11
12	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= jack@crepinc.com
13	COMMENT= Common Lisp development system derived from the CMU CL system	13	COMMENT= Common Lisp development system derived from the CMU CL system
14		14
15	LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp	15	LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp
16		16
17	USES= gmake tar:bzip2	17	USES= gmake tar:bzip2
18		18
19	ONLY_FOR_ARCHS= i386 amd64	19	OPTIONS_DEFINE= SBCL THREADS
20	SBCL_HOME= ${PREFIX}/lib/sbcl
21	MANUALS= asdf.html sbcl.html
22	MODULESDOCS= asdf/README \
23	asdf/README.SBCL \
24	sb-aclrepl/README \
25	sb-bsd-sockets/FAQ \
26	sb-bsd-sockets/NEWS \
27	sb-md5/README \
28	sb-posix/README \
29	sb-rotate-byte/README \
30	sb-simple-streams/README
31	TEXTDOCS= BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO
32	CFLAGS+= -fno-omit-frame-pointer
33	CPPFLAGS+= -I. -DSBCL_PREFIX=\\\"\$$(SBCL_PREFIX)\\\"
34	CONMODULES= asdf sb-aclrepl sb-bsd-sockets sb-cltl2 sb-concurrency \
35	sb-cover sb-executable sb-gmp sb-grovel sb-introspect \
36	sb-md5 sb-mpfr sb-posix sb-queue sb-rotate-byte sb-rt \
37	sb-simple-streams sb-sprof
38
39	MAKE_SH_ARGS?= --prefix=${PREFIX} \
40	--dynamic-space-size=${DYNAMIC_SPACE_SIZE} \
41	--with-sb-core-compression \
42	--with-sb-qshow
43	NM?= /usr/bin/nm
44	NMFLAGS?= -gp
45		20
46	BOOT_ARCH_OS_LIST= 1.0.31-amd64-freebsd8 1.0.31-i386-freebsd8 \	21	SBCL_DESC= Bootstrap with installed SBCL binary, if available
47	1.2.9-x86_64-dragonfly4	22	THREADS_DESC= Experimental threading support
48		23
49	OPTIONS_DEFINE= SBCL #THREADS (don't build, see PR 184425)	24	CONTRIB_MODULES= asdf \
50	SBCL_DESC= Bootstrap with installed SBCL binary, if available	25	sb-aclrepl \
51	THREADS_DESC= Experimental threading support	26	sb-bsd-sockets \
		27	sb-cltl2 \
		28	sb-concurrency \
		29	sb-cover \
		30	sb-executable \
		31	sb-gmp \
		32	sb-grovel \
		33	sb-introspect \
		34	sb-md5 \
		35	sb-mpfr \
		36	sb-posix \
		37	sb-queue \
		38	sb-rotate-byte \
		39	sb-rt \
		40	sb-simple-streams \
		41	sb-sprof
		42	NEWBOOTNAME= ${PORTNAME}-${PORTVERSION}-${ARCH}-freebsd${OSREL:R}
		43	ONLY_FOR_ARCHS= i386 amd64
		44	ONLY_FOR_ARCHS_REASON= is a native code compiler, and has not been ported to\
		45	this architecture yet
		46	SBCL_HOME= ${PREFIX}/lib/sbcl
52		47
53	.include <bsd.port.options.mk>	48	.include <bsd.port.options.mk>
54		49
55	NEWBOOTNAME= sbcl-${PORTVERSION}-${ARCH}-${OPSYS:tl}${OSREL:R}	50	CFLAGS+= -fno-omit-frame-pointer
56	PATTERN= -${ARCH}-${OPSYS:tl}	51	CPPFLAGS+= -I. -DSBCL_PREFIX=\\\"\$$(SBCL_PREFIX)\\\"
57	# FreeBSD hack is to support legacy make, add unrelated core fix while here
58	. if ${OPSYS} == FreeBSD
59	CORE= sbcl.core
60	BOOT_DISTNAME= sbcl-1.0.31-${ARCH}-freebsd8
61	. else # newer core format
62	CORE= sbcl_core
63	BOOT_DISTNAME= sbcl-${BOOT_ARCH_OS_LIST:M${PATTERN}}
64	. endif
65
66	.if make(makesum)
67	. for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST}
68	DISTFILES:= ${DISTFILES} sbcl-${BOOT_ARCH_OS}-binary.tar.bz2:binaries
69	. endfor
70	.else
71	DISTFILES:= ${DISTFILES} ${BOOT_DISTNAME}-binary.tar.bz2:binaries
72	.endif
73		52
74	.if ${ARCH} == "i386"	53	.if ${ARCH} == "i386"
75	DYNAMIC_SPACE_SIZE?= 512	54	DYNAMIC_SPACE_SIZE?= 512
76	PLIST_SUB+= I386_ONLY="" AMD64_ONLY="@comment "	55	PLIST_SUB+= I386_ONLY="" AMD64_ONLY="@comment "
77	SBCLCONFIG= Config.x86-${OPSYS:tl}	56	SBCLCONFIG= Config.x86-freebsd
78	.else	57	.else
79	DYNAMIC_SPACE_SIZE?= 1024	58	DYNAMIC_SPACE_SIZE?= 1024
80	PLIST_SUB+= I386_ONLY="@comment " AMD64_ONLY=""	59	PLIST_SUB+= I386_ONLY="@comment " AMD64_ONLY=""
81	SBCLCONFIG= Config.x86-64-${OPSYS:tl}	60	SBCLCONFIG= Config.x86-64-freebsd
		61	.endif
		62
		63	MAKE_SH_ARGS?= --prefix=${PREFIX} --dynamic-space-size=${DYNAMIC_SPACE_SIZE} \
		64	--with-sb-core-compression --with-sb-qshow
		65	NM?= /usr/bin/nm
		66	NMFLAGS?= -gp
		67
		68	.if ${PORT_OPTIONS:MDOCS} \|\| make(makesum)
		69	DISTFILES+= \
		70	${PORTNAME}-${PORTVERSION}-documentation-html${EXTRACT_SUFX}
		71	MANUALS= asdf.html sbcl.html
		72	MODULESDOCS= asdf/README asdf/README.SBCL \
		73	sb-simple-streams/README \
		74	sb-mpfr/README.md \
		75	sb-gmp/README.md \
		76	sb-posix/README \
		77	sb-md5/README \
		78	sb-bsd-sockets/NEWS \
		79	sb-bsd-sockets/FAQ \
		80	sb-aclrepl/README \
		81	sb-rotate-byte/README \
		82
		83	TEXTDOCS= BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO
82	.endif	84	.endif
83		85
84	# If the SBCL option is enabled, try to use existing "sbcl" first:	86	# If the SBCL option is enabled, try to use existing "sbcl" first:
85	.if empty(PORT_OPTIONS:MSBCL) \|\| !exists(${LOCALBASE}/bin/sbcl)	87	.if empty(PORT_OPTIONS:MSBCL) \|\| !exists(${LOCALBASE}/bin/sbcl) \|\| make(makesum)
86	XC_HOST?= ${WRKDIR}/${BOOT_DISTNAME}/src/runtime/sbcl \	88	BOOT_VERSION= 1.0.31
87	--core ${WRKDIR}/${BOOT_DISTNAME}/output/${CORE} \	89
88	--dynamic-space-size ${DYNAMIC_SPACE_SIZE} \	90	. if make(makesum)
89	--disable-debugger \	91	BOOT_ARCH_OS_LIST= amd64-freebsd8 i386-freebsd8
90	--userinit /dev/null \	92	. else
91	--sysinit /dev/null	93	. if ${OSREL:R} > 8 # We'll use 8.x bootstrap for now
		94	BOOT_ARCH_OS_LIST= ${ARCH}-freebsd8
		95	. else
		96	BOOT_ARCH_OS_LIST= ${ARCH}-freebsd${OSREL:R}
		97	. endif
		98	. endif
		99
		100	. for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST}
		101	BOOT_DISTNAME= ${PORTNAME}-${BOOT_VERSION}-${BOOT_ARCH_OS}
		102	DISTFILES:= ${DISTFILES} ${BOOT_DISTNAME}-binary${EXTRACT_SUFX}:binaries
		103	. endfor
		104
		105	XC_HOST?= ${WRKDIR}/${BOOT_DISTNAME}/src/runtime/sbcl --core \
		106	${WRKDIR}/${BOOT_DISTNAME}/output/sbcl.core \
		107	--dynamic-space-size ${DYNAMIC_SPACE_SIZE} \
		108	--disable-debugger --userinit /dev/null --sysinit /dev/null
92	MAKE_SH_ARGS+= --xc-host='${XC_HOST}'	109	MAKE_SH_ARGS+= --xc-host='${XC_HOST}'
		110
93	.endif # SBCL	111	.endif # SBCL
94		112
95	.if ${PORT_OPTIONS:MTHREADS}	113	.if ${PORT_OPTIONS:MTHREADS}
96	MAKE_SH_ARGS+= --with-sb-thread	114	MAKE_SH_ARGS+= --with-sb-thread
97	. if defined(WITH_FUTEX)	115	.if defined(WITH_FUTEX)
98	MAKE_SH_ARGS+= --with-sb-futex	116	MAKE_SH_ARGS+= --with-sb-futex
99	. else	117	.else
100	MAKE_SH_ARGS+= --without-sb-futex	118	MAKE_SH_ARGS+= --without-sb-futex
101	. endif	119	.endif
102	. if defined(WITH_SAFEPOINT) \|\| defined(WITH_STRICT_SAFEPOINT)	120	.if defined(WITH_SAFEPOINT) \|\| defined(WITH_STRICT_SAFEPOINT)
103	MAKE_SH_ARGS+= --with-sb-safepoint --with-sb-thruption --with-sb-wtimer	121	MAKE_SH_ARGS+= --with-sb-safepoint --with-sb-thruption --with-sb-wtimer
104	. if defined(WITH_STRICT_SAFEPOINT)	122	.if defined(WITH_STRICT_SAFEPOINT)
105	MAKE_SH_ARGS+= --with-sb-safepoint-strictly	123	MAKE_SH_ARGS+= --with-sb-safepoint-strictly
106	. else	124	.else
107	MAKE_SH_ARGS+= --without-sb-safepoint-strictly	125	MAKE_SH_ARGS+= --without-sb-safepoint-strictly
108	. endif	126	.endif
109	. else	127	.else
110	MAKE_SH_ARGS+= --without-sb-safepoint \	128	MAKE_SH_ARGS+= --without-sb-safepoint --without-sb-safepoint-strictly \
111	--without-sb-safepoint-strictly \	129	--without-sb-thruption --without-sb-wtimer
112	--without-sb-thruption \	130	.endif
113	--without-sb-wtimer
114	. endif
115	.else	131	.else
116	MAKE_SH_ARGS+= --without-sb-thread	132	MAKE_SH_ARGS+= --without-sb-thread
117	.endif	133	.endif
Lines 139-149 Link Here
139	${WRKSRC}/src/runtime/${SBCLCONFIG}	155	${WRKSRC}/src/runtime/${SBCLCONFIG}
140	@${ECHO_CMD} "NM=${NM} ${NMFLAGS}" >> \	156	@${ECHO_CMD} "NM=${NM} ${NMFLAGS}" >> \
141	${WRKSRC}/src/runtime/${SBCLCONFIG}	157	${WRKSRC}/src/runtime/${SBCLCONFIG}
142	@${REINPLACE_CMD} -E -e 's,-lthr,-lpthread,g' \	158	@${REINPLACE_CMD} -E -e 's,-lthr,-pthread,g' \
143	${WRKSRC}/src/runtime/${SBCLCONFIG}	159	-e 's,-lpthread,-pthread,g' ${WRKSRC}/src/runtime/${SBCLCONFIG}
144	@${GREP} -Fe '.core' -l -r ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} \	160	@${GREP} -Fe '.core' -l -r ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} \
145	-e 's\|\.core\|_core\|g'	161	-e 's\|\.core\|_core\|g'
146	@${REINPLACE_CMD} -e 's\|/usr/local\|${PREFIX}\|g' \	162	@${REINPLACE_CMD} \
		163	-e 's\|/usr/local\|${PREFIX}\|g' \
147	${WRKSRC}/doc/sbcl.1	164	${WRKSRC}/doc/sbcl.1
148	@${REINPLACE_CMD} -E -e 's!-sbcl-shared!& ${CFLAGS}!' \	165	@${REINPLACE_CMD} -E -e 's!-sbcl-shared!& ${CFLAGS}!' \
149	-e 's!\$$(TEST_FILESTEM\|x\|1)_core!$${\1}_core!g' \	166	-e 's!\$$(TEST_FILESTEM\|x\|1)_core!$${\1}_core!g' \
Lines 167-211 Link Here
167	${WRKSRC}/release.sh \	184	${WRKSRC}/release.sh \
168	${WRKSRC}/src/code/run-program.lisp \	185	${WRKSRC}/src/code/run-program.lisp \
169	${WRKSRC}/tests/run-compiler.sh	186	${WRKSRC}/tests/run-compiler.sh
170	@${FIND} ${WRKSRC} \( -name '.orig' -o -name '.bak' \) -delete
171		187
172	do-build:	188	do-build:
173	(cd ${WRKSRC} && ${SETENV} CC="${CC}" ${SH} make.sh ${MAKE_SH_ARGS})	189	@${FIND} ${WRKSRC} \( -name '.orig' -o -name '.bak' \) -delete
174	${RM} -rf ${WRKSRC}/contrib/sb-cover/test-output	190	@(cd ${WRKSRC} && ${SETENV} CC="${CC}" ${SH} make.sh ${MAKE_SH_ARGS})
175	${REINPLACE_CMD} -E -e \	191	@${RM} -rf ${WRKSRC}/contrib/sb-cover/test-output
		192	@${REINPLACE_CMD} -E -e \
176	's\|\$$Date\$$\|'"`${SETENV} LANG=C /bin/date '+%B %d, %Y'`\|g" \	193	's\|\$$Date\$$\|'"`${SETENV} LANG=C /bin/date '+%B %d, %Y'`\|g" \
177	${WRKSRC}/doc/sbcl.1	194	${WRKSRC}/doc/sbcl.1
178		195
179	do-install:	196	do-install:
180	${MKDIR} ${STAGEDIR}${SBCL_HOME}/contrib \	197	${MKDIR} ${STAGEDIR}${SBCL_HOME}/
181	${STAGEDIR}${SBCL_HOME}/site-systems	198	${INSTALL_PROGRAM} ${WRKSRC}/src/runtime/sbcl ${STAGEDIR}${PREFIX}/bin/
182	${INSTALL_PROGRAM} ${WRKSRC}/src/runtime/sbcl ${STAGEDIR}${PREFIX}/bin	199	${INSTALL_DATA} ${WRKSRC}/output/sbcl_core ${STAGEDIR}${SBCL_HOME}/
183	${INSTALL_DATA} ${WRKSRC}/output/sbcl_core ${STAGEDIR}${SBCL_HOME}	200	.for MOD in ${CONTRIB_MODULES}
184	${INSTALL_DATA} ${WRKSRC}/obj/sbcl-home/contrib/*.fasl \
185	${STAGEDIR}${SBCL_HOME}/contrib/
186	${INSTALL_DATA} ${WRKSRC}/obj/sbcl-home/contrib/*.asd \
187	${STAGEDIR}${SBCL_HOME}/contrib/
188	.for MOD in ${CONMODULES}
189	${MKDIR} ${STAGEDIR}${SBCL_HOME}/${MOD}	201	${MKDIR} ${STAGEDIR}${SBCL_HOME}/${MOD}
190	- ${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.lisp \	202	(if test -f ${WRKSRC}/contrib/${MOD}/${MOD}.lisp; then ${INSTALL_DATA} \
191	${STAGEDIR}${SBCL_HOME}/${MOD}	203	${WRKSRC}/contrib/${MOD}/*.lisp ${STAGEDIR}${SBCL_HOME}/${MOD}/; fi)
192	- ${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.fasl \	204	(if test -f ${WRKSRC}/contrib/${MOD}/${MOD}.fasl; then ${INSTALL_DATA} \
193	${STAGEDIR}${SBCL_HOME}/${MOD}	205	${WRKSRC}/contrib/${MOD}/*.fasl ${STAGEDIR}${SBCL_HOME}/${MOD}/; fi)
194	- ${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/${MOD}.asd \	206	(if test -f ${WRKSRC}/contrib/${MOD}/${MOD}.asd; then ${INSTALL_DATA} \
195	${STAGEDIR}${SBCL_HOME}/${MOD}	207	${WRKSRC}/contrib/${MOD}/${MOD}.asd ${STAGEDIR}${SBCL_HOME}/${MOD}/; fi)
196	.endfor	208	.endfor
197	.if ${PORT_OPTIONS:MDOCS}	209	.if ${PORT_OPTIONS:MDOCS}
198	${MKDIR} ${STAGEDIR}${DOCSDIR}/	210	${MKDIR} ${STAGEDIR}${DOCSDIR}/
199	${INSTALL_DATA} ${MANUALS:S,^, ${WRKSRC}/doc/manual/,g} \	211	${INSTALL_DATA} ${MANUALS:S,^, ${WRKSRC}/doc/manual/,g} ${STAGEDIR}${DOCSDIR}/
200	${STAGEDIR}${DOCSDIR}/
201	${INSTALL_DATA} ${TEXTDOCS:S,^,${WRKSRC}/,g} ${STAGEDIR}${DOCSDIR}/	212	${INSTALL_DATA} ${TEXTDOCS:S,^,${WRKSRC}/,g} ${STAGEDIR}${DOCSDIR}/
202	${MKDIR} ${MODULESDOCS:C,/[^/]+$,,g:u:S,^,${STAGEDIR}${DOCSDIR}/,g}	213	${MKDIR} ${MODULESDOCS:C,/[^/]+$,,g:u:S,^,${STAGEDIR}${DOCSDIR}/,g}
203	. for MODDOC in ${MODULESDOCS}	214	. for MODDOC in ${MODULESDOCS}
204	${INSTALL_DATA} ${WRKSRC}/contrib/${MODDOC} \	215	${INSTALL_DATA} ${WRKSRC}/contrib/${MODDOC} ${STAGEDIR}${DOCSDIR}/${MODDOC}
205	${STAGEDIR}${DOCSDIR}/${MODDOC}
206	. endfor	216	. endfor
207	.endif	217	.endif
208	${INSTALL_MAN} ${WRKSRC}/doc/sbcl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1	218	${INSTALL_MAN} ${WRKSRC}/doc/sbcl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
		219	${MKDIR} ${STAGEDIR}${SBCL_HOME}/site-systems
		220	@${TOUCH} ${STAGEDIR}${SBCL_HOME}/site-systems/.keep_me
209		221
210	check regression-test test: build	222	check regression-test test: build
211	(cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" ${SH} run-tests.sh)	223	(cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" ${SH} run-tests.sh)

Lines 1-14 Link Here

(-)/usr/ports/lang/sbcl/files/patch-contrib__sb-sprof__test.lisp (-14 lines)
1	--- contrib/sb-sprof/test.lisp.orig 2015-02-27 19:49:46.000000000 +0900
2	+++ contrib/sb-sprof/test.lisp 2015-03-07 18:19:20.000000000 +0900
3	@@ -41,9 +41,9 @@
4	(loop while (< (get-universal-time) target)
5	do (consalot)))))
6
7	-#-(or win32 darwin) ;not yet
8	+#-(or win32 darwin freebsd) ;not yet
9	(test)
10	-#-(or win32 darwin) ;not yet
11	+#-(or win32 darwin freebsd) ;not yet
12	(consing-test)
13
14	;; For debugging purposes, print output for visual inspection to see if

Lines 1-17 Link Here

(-)/usr/ports/lang/sbcl/files/patch-src__runtime__thread.c (-17 lines)
1	--- src/runtime/thread.c.orig 2015-02-27 19:49:49.000000000 +0900
2	+++ src/runtime/thread.c 2015-03-07 18:27:45.000000000 +0900
3	@@ -520,10 +520,13 @@
4	stack_addr = pthread_get_stackaddr_np(os);
5	stack_size = pthread_get_stacksize_np(os);
6	#else
7	- pthread_attr_t attr;
8	+/* pthread_attr_t attr;
9	int pthread_getattr_np(pthread_t, pthread_attr_t *);
10	pthread_getattr_np(os, &attr);
11	pthread_attr_getstack(&attr, &stack_addr, &stack_size);
12	+*/
13	+ pthread_attr_getstackaddr(th->os_attr, &stack_addr);
14	+ pthread_attr_getstacksize(th->os_attr, &stack_size);
15	#endif
16
17	th->control_stack_start = stack_addr;

Lines 1-145 Link Here

(-)/usr/ports/lang/sbcl/pkg-plist (-121 / +3 lines)
1	bin/sbcl	1	bin/sbcl
2	lib/sbcl/asdf/asdf.lisp	2	lib/sbcl/asdf/asdf.lisp
3	lib/sbcl/asdf/uiop.lisp	3	lib/sbcl/asdf/uiop.lisp
4	lib/sbcl/contrib/asdf.fasl
5	lib/sbcl/contrib/sb-aclrepl.asd
6	lib/sbcl/contrib/sb-aclrepl.fasl
7	lib/sbcl/contrib/sb-bsd-sockets.asd
8	lib/sbcl/contrib/sb-bsd-sockets.fasl
9	lib/sbcl/contrib/sb-cltl2.asd
10	lib/sbcl/contrib/sb-cltl2.fasl
11	lib/sbcl/contrib/sb-concurrency.asd
12	lib/sbcl/contrib/sb-concurrency.fasl
13	lib/sbcl/contrib/sb-cover.asd
14	lib/sbcl/contrib/sb-cover.fasl
15	lib/sbcl/contrib/sb-executable.asd
16	lib/sbcl/contrib/sb-executable.fasl
17	lib/sbcl/contrib/sb-gmp.asd
18	lib/sbcl/contrib/sb-gmp.fasl
19	lib/sbcl/contrib/sb-grovel.asd
20	lib/sbcl/contrib/sb-grovel.fasl
21	lib/sbcl/contrib/sb-introspect.asd
22	lib/sbcl/contrib/sb-introspect.fasl
23	lib/sbcl/contrib/sb-md5.asd
24	lib/sbcl/contrib/sb-md5.fasl
25	lib/sbcl/contrib/sb-mpfr.asd
26	lib/sbcl/contrib/sb-mpfr.fasl
27	lib/sbcl/contrib/sb-posix.asd
28	lib/sbcl/contrib/sb-posix.fasl
29	lib/sbcl/contrib/sb-queue.asd
30	lib/sbcl/contrib/sb-queue.fasl
31	lib/sbcl/contrib/sb-rotate-byte.asd
32	lib/sbcl/contrib/sb-rotate-byte.fasl
33	lib/sbcl/contrib/sb-rt.asd
34	lib/sbcl/contrib/sb-rt.fasl
35	lib/sbcl/contrib/sb-simple-streams.asd
36	lib/sbcl/contrib/sb-simple-streams.fasl
37	lib/sbcl/contrib/sb-sprof.asd
38	lib/sbcl/contrib/sb-sprof.fasl
39	lib/sbcl/contrib/uiop.fasl
40	lib/sbcl/sb-aclrepl/debug.lisp
41	lib/sbcl/sb-aclrepl/inspect.lisp
42	lib/sbcl/sb-aclrepl/repl.lisp
43	lib/sbcl/sb-aclrepl/sb-aclrepl.asd	4	lib/sbcl/sb-aclrepl/sb-aclrepl.asd
44	lib/sbcl/sb-aclrepl/tests.lisp
45	lib/sbcl/sb-aclrepl/toplevel.lisp
46	lib/sbcl/sb-bsd-sockets/constants.lisp
47	lib/sbcl/sb-bsd-sockets/defpackage.lisp
48	lib/sbcl/sb-bsd-sockets/inet.lisp
49	lib/sbcl/sb-bsd-sockets/inet4.lisp
50	lib/sbcl/sb-bsd-sockets/inet6.lisp
51	lib/sbcl/sb-bsd-sockets/local.lisp
52	lib/sbcl/sb-bsd-sockets/misc.lisp
53	lib/sbcl/sb-bsd-sockets/name-service.lisp
54	lib/sbcl/sb-bsd-sockets/protocol.lisp
55	lib/sbcl/sb-bsd-sockets/sb-bsd-sockets.asd	5	lib/sbcl/sb-bsd-sockets/sb-bsd-sockets.asd
56	lib/sbcl/sb-bsd-sockets/sockets.lisp
57	lib/sbcl/sb-bsd-sockets/sockopt.lisp
58	lib/sbcl/sb-bsd-sockets/tests.lisp
59	lib/sbcl/sb-bsd-sockets/util.lisp
60	lib/sbcl/sb-bsd-sockets/win32-constants.lisp
61	lib/sbcl/sb-bsd-sockets/win32-lib.lisp
62	lib/sbcl/sb-bsd-sockets/win32-sockets.lisp
63	lib/sbcl/sb-cltl2/compiler-let.lisp
64	lib/sbcl/sb-cltl2/defpackage.lisp
65	lib/sbcl/sb-cltl2/env.lisp
66	lib/sbcl/sb-cltl2/macroexpand.lisp
67	lib/sbcl/sb-cltl2/sb-cltl2.asd	6	lib/sbcl/sb-cltl2/sb-cltl2.asd
68	lib/sbcl/sb-cltl2/tests.lisp
69	lib/sbcl/sb-concurrency/frlock.lisp
70	lib/sbcl/sb-concurrency/gate.lisp
71	lib/sbcl/sb-concurrency/mailbox.lisp
72	lib/sbcl/sb-concurrency/package.lisp
73	lib/sbcl/sb-concurrency/queue.lisp
74	lib/sbcl/sb-concurrency/sb-concurrency.asd	7	lib/sbcl/sb-concurrency/sb-concurrency.asd
75	lib/sbcl/sb-cover/cover.lisp
76	lib/sbcl/sb-cover/sb-cover.asd	8	lib/sbcl/sb-cover/sb-cover.asd
77	lib/sbcl/sb-cover/test-data-1.lisp
78	lib/sbcl/sb-cover/test-data-2.lisp
79	lib/sbcl/sb-cover/test-data-3.lisp
80	lib/sbcl/sb-cover/tests.lisp
81	lib/sbcl/sb-executable/sb-executable.lisp	9	lib/sbcl/sb-executable/sb-executable.lisp
82	lib/sbcl/sb-gmp/bench.lisp
83	lib/sbcl/sb-gmp/gmp.lisp
84	lib/sbcl/sb-gmp/sb-gmp.asd	10	lib/sbcl/sb-gmp/sb-gmp.asd
85	lib/sbcl/sb-gmp/tests-stress.lisp
86	lib/sbcl/sb-gmp/tests.lisp
87	lib/sbcl/sb-grovel/def-to-lisp.lisp
88	lib/sbcl/sb-grovel/defpackage.lisp
89	lib/sbcl/sb-grovel/example-constants.lisp
90	lib/sbcl/sb-grovel/foreign-glue.lisp
91	lib/sbcl/sb-grovel/sb-grovel.asd	11	lib/sbcl/sb-grovel/sb-grovel.asd
92	lib/sbcl/sb-introspect/introspect.lisp
93	lib/sbcl/sb-introspect/load-test.lisp
94	lib/sbcl/sb-introspect/sb-introspect.asd	12	lib/sbcl/sb-introspect/sb-introspect.asd
95	lib/sbcl/sb-introspect/test-driver.lisp
96	lib/sbcl/sb-introspect/test.lisp
97	lib/sbcl/sb-introspect/xref-test-data.lisp
98	lib/sbcl/sb-introspect/xref-test.lisp
99	lib/sbcl/sb-md5/md5-tests.lisp
100	lib/sbcl/sb-md5/md5.lisp
101	lib/sbcl/sb-md5/sb-md5.asd	13	lib/sbcl/sb-md5/sb-md5.asd
102	lib/sbcl/sb-mpfr/mpfr.lisp
103	lib/sbcl/sb-mpfr/sb-mpfr.asd	14	lib/sbcl/sb-mpfr/sb-mpfr.asd
104	lib/sbcl/sb-mpfr/tests.lisp
105	lib/sbcl/sb-posix/constants.lisp
106	lib/sbcl/sb-posix/defpackage.lisp
107	lib/sbcl/sb-posix/designator.lisp
108	lib/sbcl/sb-posix/interface.lisp
109	lib/sbcl/sb-posix/macros.lisp
110	lib/sbcl/sb-posix/posix-tests.lisp
111	lib/sbcl/sb-posix/sb-posix.asd	15	lib/sbcl/sb-posix/sb-posix.asd
112	lib/sbcl/sb-queue/package.lisp
113	lib/sbcl/sb-queue/sb-queue.asd	16	lib/sbcl/sb-queue/sb-queue.asd
114	lib/sbcl/sb-rotate-byte/arm-vm.lisp
115	lib/sbcl/sb-rotate-byte/compiler.lisp
116	lib/sbcl/sb-rotate-byte/package.lisp
117	lib/sbcl/sb-rotate-byte/ppc-vm.lisp
118	lib/sbcl/sb-rotate-byte/rotate-byte-tests.lisp
119	lib/sbcl/sb-rotate-byte/rotate-byte.lisp
120	lib/sbcl/sb-rotate-byte/sb-rotate-byte.asd	17	lib/sbcl/sb-rotate-byte/sb-rotate-byte.asd
121	lib/sbcl/sb-rotate-byte/x86-64-vm.lisp
122	lib/sbcl/sb-rotate-byte/x86-vm.lisp
123	lib/sbcl/sb-rt/rt.lisp
124	lib/sbcl/sb-rt/sb-rt.asd	18	lib/sbcl/sb-rt/sb-rt.asd
125	lib/sbcl/sb-simple-streams/classes.lisp
126	lib/sbcl/sb-simple-streams/direct.lisp
127	lib/sbcl/sb-simple-streams/file.lisp
128	lib/sbcl/sb-simple-streams/fndb.lisp
129	lib/sbcl/sb-simple-streams/impl.lisp
130	lib/sbcl/sb-simple-streams/internal.lisp
131	lib/sbcl/sb-simple-streams/iodefs.lisp
132	lib/sbcl/sb-simple-streams/null.lisp
133	lib/sbcl/sb-simple-streams/package.lisp
134	lib/sbcl/sb-simple-streams/sb-simple-streams.asd	19	lib/sbcl/sb-simple-streams/sb-simple-streams.asd
135	lib/sbcl/sb-simple-streams/simple-stream-tests.lisp
136	lib/sbcl/sb-simple-streams/socket.lisp
137	lib/sbcl/sb-simple-streams/strategy.lisp
138	lib/sbcl/sb-simple-streams/string.lisp
139	lib/sbcl/sb-simple-streams/terminal.lisp
140	lib/sbcl/sb-sprof/sb-sprof.lisp	20	lib/sbcl/sb-sprof/sb-sprof.lisp
141	lib/sbcl/sb-sprof/test.lisp	21	lib/sbcl/sb-sprof/test.lisp
142	lib/sbcl/sbcl_core	22	lib/sbcl/sbcl_core
		23	lib/sbcl/site-systems/.keep_me
143	man/man1/sbcl.1.gz	24	man/man1/sbcl.1.gz
144	%%PORTDOCS%%%%DOCSDIR%%/BUGS	25	%%PORTDOCS%%%%DOCSDIR%%/BUGS
145	%%PORTDOCS%%%%DOCSDIR%%/COPYING	26	%%PORTDOCS%%%%DOCSDIR%%/COPYING
Lines 154-162 Link Here
154	%%PORTDOCS%%%%DOCSDIR%%/sb-aclrepl/README	35	%%PORTDOCS%%%%DOCSDIR%%/sb-aclrepl/README
155	%%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/FAQ	36	%%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/FAQ
156	%%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/NEWS	37	%%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/NEWS
		38	%%PORTDOCS%%%%DOCSDIR%%/sb-gmp/README.md
157	%%PORTDOCS%%%%DOCSDIR%%/sb-md5/README	39	%%PORTDOCS%%%%DOCSDIR%%/sb-md5/README
		40	%%PORTDOCS%%%%DOCSDIR%%/sb-mpfr/README.md
158	%%PORTDOCS%%%%DOCSDIR%%/sb-posix/README	41	%%PORTDOCS%%%%DOCSDIR%%/sb-posix/README
159	%%PORTDOCS%%%%DOCSDIR%%/sb-rotate-byte/README	42	%%PORTDOCS%%%%DOCSDIR%%/sb-rotate-byte/README
160	%%PORTDOCS%%%%DOCSDIR%%/sb-simple-streams/README	43	%%PORTDOCS%%%%DOCSDIR%%/sb-simple-streams/README
161	%%PORTDOCS%%%%DOCSDIR%%/sbcl.html	44	%%PORTDOCS%%%%DOCSDIR%%/sbcl.html
162	@dir lib/sbcl/site-systems