ports/146623: [PATCH]lang/sbcl: update to 1.0.38

bf bf1783 at gmail.com
Sat May 15 20:20:08 UTC 2010 

>Number:         146623
>Category:       ports
>Synopsis:       [PATCH]lang/sbcl: update to 1.0.38
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 15 20:20:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        9-CURRENT amd64
>Organization:
-
>Environment:
>Description:
-update to 1.0.38
-allow memory upper bound on amd64, too
-respect CC, *FLAGS, and toolchain-related variables

n.b. WITH_THREADS hangs during the sb-concurrency tests on my machine.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -x 'old.*' -x 'new.*' -ruN sbcl.orig/Makefile sbcl/Makefile
--- sbcl.orig/Makefile	2010-05-15 08:28:02.000000000 -0400
+++ sbcl/Makefile	2010-05-15 15:25:02.000000000 -0400
@@ -9,8 +9,7 @@
 #
 
 PORTNAME=	sbcl
-PORTVERSION=	1.0.34.0
-PORTREVISION=	0
+PORTVERSION=	1.0.38.0
 CATEGORIES=	lang lisp
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} \
 		ftp://ftp.SpringDaemons.com/soft/sbcl-binary/:binaries
@@ -28,7 +27,9 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-CFLAGS+=	-DSBCL_HOME=\\"${PREFIX}/lib/sbcl/\\"
+CFLAGS+=	-DSBCL_HOME=\\\"${PREFIX}/lib/sbcl/\\\" -fno-omit-frame-pointer
+CPPFLAGS+=	-I.
+LDFLAGS+=	-dynamic -rdynamic
 
 OPTIONS=	SBCL "Use installed SBCL binary if available" off \
 		THREADS "Enable experimental threading support" off
@@ -52,14 +53,15 @@
 EMPTY_DIRS=	sb-bsd-sockets/alien sb-posix/alien sb-posix/test-lab \
 		site-systems
 
-DYNAMIC_SPACE_SIZE?=	512
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
-PLIST_SUB+=	I386_ONLY=""
+PLIST_SUB+=	I386_ONLY="" AMD64_ONLY="@comment "
+SBCLCONFIG=	 Config.x86-freebsd
+DYNAMIC_SPACE_SIZE?=	512
 .else
-PLIST_SUB+=	I386_ONLY="@comment "
+PLIST_SUB+=	I386_ONLY="@comment " AMD64_ONLY=""
+SBCLCONFIG=	Config.x86-64-freebsd
 .endif
 
 # If WITH_SBCL is defined, try to use existing "sbcl" first.
@@ -79,7 +81,7 @@
 .  endif
 . endif
 
-. if ${ARCH} == "i386"
+. ifdef(DYNAMIC_SPACE_SIZE)
 LISP_EXTRA_ARG=	--dynamic-space-size ${DYNAMIC_SPACE_SIZE}
 . endif
 
@@ -104,22 +106,36 @@
 	@${ECHO_MSG}
 
 post-patch:
-	@${REINPLACE_CMD} -E -e 's|(CFLAGS =) .*|\1 ${CFLAGS}|' \
-		${WRKSRC}/src/runtime/GNUmakefile
+	@echo "CC=${CC}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
+	@echo "CFLAGS=${CFLAGS} -fno-omit-frame-pointer" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
+	@echo "CPPFLAGS=${CPPFLAGS}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
+	@echo "GREP=${GREP}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
+	@echo "LD=${LD}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
+	@echo "LINKFLAGS=${LDFLAGS}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
+.ifdef(NM)
+	@echo "NM=${NM} -gp" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
+.endif
+	@${REINPLACE_CMD} -e '\|CC=|s|gcc|${CC}|'  ${WRKSRC}/contrib/asdf-module.mk
+	@${REINPLACE_CMD} -e 's|"cc"|"${CC}"|' \
+		-e 's|"-O3"|"${CFLAGS}"|' \
+			${WRKSRC}/tests/swap-lispobjs.impure.lisp
+	@${REINPLACE_CMD} -e 's|cc -c|${CC} -c|' \
+		-e 's|ld \$$SO_FLAGS|${LD} \$$SO_FLAGS|' \
+			 ${WRKSRC}/tests/foreign.test.sh
 	@${FIND} ${WRKSRC} -name '*.orig' -o -name '*.bak' -delete
 .if defined(WITH_THREADS)
 	@${CP} ${FILESDIR}/customize-target-features.lisp ${WRKSRC}
 .endif
 
 do-build:
-	@(cd ${WRKSRC} && ${SETENV} INSTALL_ROOT=${PREFIX} \
+	@(cd ${WRKSRC} && ${SETENV} CC="${CC}" INSTALL_ROOT=${PREFIX} \
 		${SH} make.sh ${LISP_CMD})
 	@${RM} -rf ${WRKSRC}/contrib/sb-cover/test-output
 	@(cd ${WRKSRC}/doc/manual && \
 		${GMAKE} MAKEINFO='makeinfo --no-split' info)
 
 do-install:
-	(cd ${WRKSRC} && ${SETENV} INSTALL_ROOT=${PREFIX} \
+	(cd ${WRKSRC} && ${SETENV} CC="${CC}" INSTALL_ROOT=${PREFIX} \
 		MAN_DIR=${PREFIX}/man DOC_DIR=${DOCSDIR} \
 		INFO_DIR=${INFODIR} ${SH} install.sh)
 	@${RMDIR} ${DOCSDIR}/html
@@ -131,7 +147,7 @@
 .endfor
 
 test:	build
-	(cd ${WRKSRC}/tests && ${SH} run-tests.sh)
+	(cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" ${SH} run-tests.sh)
 
 bootstrap:
 	${CP} -r ${WRKSRC} ${WRKDIR}/${NEWBOOTNAME}
diff -x 'old.*' -x 'new.*' -ruN sbcl.orig/distinfo sbcl/distinfo
--- sbcl.orig/distinfo	2010-05-15 08:28:02.000000000 -0400
+++ sbcl/distinfo	2010-05-15 08:35:40.000000000 -0400
@@ -1,6 +1,6 @@
-MD5 (sbcl-1.0.34-source.tar.bz2) = 78c1a003281d11690f54609b4f5303f4
-SHA256 (sbcl-1.0.34-source.tar.bz2) = 59b90544acbfd0232a2e05154223e9cbf6b7bfc7f05ddc26ee850bd0bc220170
-SIZE (sbcl-1.0.34-source.tar.bz2) = 3384606
+MD5 (sbcl-1.0.38-source.tar.bz2) = a275b47c2f18cf2d20594d7b5463835f
+SHA256 (sbcl-1.0.38-source.tar.bz2) = 9c34c93616a485573f119265cc5cafb0ebf23b1a97bc5f066f82e9f2d99b393a
+SIZE (sbcl-1.0.38-source.tar.bz2) = 3415742
 MD5 (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = eb21c4c454d0ef9784d679d9c913f789
 SHA256 (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 06a1e4e3a5f5f8e012ff6037a51624d7d1f34bff0979ce45e70418a293412b4e
 SIZE (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 8397764
diff -x 'old.*' -x 'new.*' -ruN sbcl.orig/pkg-plist sbcl/pkg-plist
--- sbcl.orig/pkg-plist	2010-05-15 08:28:02.000000000 -0400
+++ sbcl/pkg-plist	2010-05-15 12:39:08.000000000 -0400
@@ -82,6 +82,25 @@
 lib/sbcl/sb-cltl2/test-passed
 lib/sbcl/sb-cltl2/tests.fasl
 lib/sbcl/sb-cltl2/tests.lisp
+lib/sbcl/sb-concurrency/Makefile
+lib/sbcl/sb-concurrency/mailbox.fasl
+lib/sbcl/sb-concurrency/mailbox.lisp
+lib/sbcl/sb-concurrency/package.fasl
+lib/sbcl/sb-concurrency/package.lisp
+lib/sbcl/sb-concurrency/queue.fasl
+lib/sbcl/sb-concurrency/queue.lisp
+lib/sbcl/sb-concurrency/sb-concurrency.asd
+lib/sbcl/sb-concurrency/sb-concurrency.fasl
+lib/sbcl/sb-concurrency/sb-concurrency.texinfo
+lib/sbcl/sb-concurrency/test-passed
+lib/sbcl/sb-concurrency/tests/package.fasl
+lib/sbcl/sb-concurrency/tests/package.lisp
+lib/sbcl/sb-concurrency/tests/test-mailbox.fasl
+lib/sbcl/sb-concurrency/tests/test-mailbox.lisp
+lib/sbcl/sb-concurrency/tests/test-queue.fasl
+lib/sbcl/sb-concurrency/tests/test-queue.lisp
+lib/sbcl/sb-concurrency/tests/test-utils.fasl
+lib/sbcl/sb-concurrency/tests/test-utils.lisp
 lib/sbcl/sb-cover/.cvsignore
 lib/sbcl/sb-cover/Makefile
 lib/sbcl/sb-cover/cover.fasl
@@ -165,14 +184,12 @@
 lib/sbcl/sb-posix/test-lab/.keep_me
 lib/sbcl/sb-queue/.cvsignore
 lib/sbcl/sb-queue/Makefile
-lib/sbcl/sb-queue/queue.fasl
-lib/sbcl/sb-queue/queue.lisp
+lib/sbcl/sb-queue/package.fasl
+lib/sbcl/sb-queue/package.lisp
 lib/sbcl/sb-queue/sb-queue.asd
 lib/sbcl/sb-queue/sb-queue.texinfo
 lib/sbcl/sb-queue/sb-queue.fasl
 lib/sbcl/sb-queue/test-passed
-lib/sbcl/sb-queue/test-queue.fasl
-lib/sbcl/sb-queue/test-queue.lisp
 lib/sbcl/sb-rotate-byte/.cvsignore
 lib/sbcl/sb-rotate-byte/Makefile
 lib/sbcl/sb-rotate-byte/README
@@ -189,6 +206,8 @@
 lib/sbcl/sb-rotate-byte/sb-rotate-byte.fasl
 lib/sbcl/sb-rotate-byte/sb-rotate-byte.texinfo
 lib/sbcl/sb-rotate-byte/test-passed
+%%AMD64_ONLY%%lib/sbcl/sb-rotate-byte/x86-64-vm.fasl
+%%AMD64_ONLY%%lib/sbcl/sb-rotate-byte/x86-64-vm.lisp
 %%I386_ONLY%%lib/sbcl/sb-rotate-byte/x86-vm.fasl
 lib/sbcl/sb-rotate-byte/x86-vm.lisp
 lib/sbcl/sb-rt/.cvsignore
@@ -216,6 +235,7 @@
 lib/sbcl/sb-simple-streams/internal.lisp
 lib/sbcl/sb-simple-streams/iodefs.fasl
 lib/sbcl/sb-simple-streams/iodefs.lisp
+lib/sbcl/sb-simple-streams/lp491087.txt
 lib/sbcl/sb-simple-streams/null.fasl
 lib/sbcl/sb-simple-streams/null.lisp
 lib/sbcl/sb-simple-streams/package.fasl
@@ -253,6 +273,8 @@
 @dirrm lib/sbcl/sb-grovel
 @dirrm lib/sbcl/sb-executable
 @dirrm lib/sbcl/sb-cover
+ at dirrm lib/sbcl/sb-concurrency/tests
+ at dirrm lib/sbcl/sb-concurrency
 @dirrm lib/sbcl/sb-cltl2
 @dirrm lib/sbcl/sb-bsd-sockets/alien
 @dirrm lib/sbcl/sb-bsd-sockets


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list