[gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
@ 2011-03-29 22:51 Stelian Ionescu
  0 siblings, 0 replies; 13+ messages in thread
From: Stelian Ionescu @ 2011-03-29 22:51 UTC (permalink / raw
  To: gentoo-commits

commit:     dde4ba3557de23f96808c400a657f9898f2001d9
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Tue Mar 29 22:50:30 2011 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Tue Mar 29 22:50:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=dde4ba35

dev-lisp/sbcl: bump to version 1.0.47

---
 .../files/1.0.47-gentoo-fix_build_system.patch     |  546 ++++++++++++++++++++
 .../{sbcl-1.0.45.ebuild => sbcl-1.0.47.ebuild}     |    1 -
 2 files changed, 546 insertions(+), 1 deletions(-)

diff --git a/dev-lisp/sbcl/files/1.0.47-gentoo-fix_build_system.patch b/dev-lisp/sbcl/files/1.0.47-gentoo-fix_build_system.patch
new file mode 100644
index 0000000..3921255
--- /dev/null
+++ b/dev-lisp/sbcl/files/1.0.47-gentoo-fix_build_system.patch
@@ -0,0 +1,546 @@
+diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
+index d3ffbad..7a5936e 100644
+--- a/contrib/asdf-module.mk
++++ b/contrib/asdf-module.mk
+@@ -1,3 +1,5 @@
++# -*- makefile -*- included by contribs built with ASDF
++
+ CC=gcc
+ 
+ # We need to extend flags to the C compiler and the linker
+@@ -7,6 +9,9 @@ CC=gcc
+ # directly via ASDF from a non-C-aware module which has these tricky
+ # ones as dependencies.
+ 
++# from src/runtime/
++-include platform.mk
++
+ UNAME:=$(shell uname -s)
+ 
+ ifeq (SunOS,$(UNAME))
+@@ -23,7 +28,9 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
+   CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC))))
+ endif
+ 
+-export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
++EXTRA_CFLAGS += $(CFLAGS)
++
++export CC SBCL EXTRA_CFLAGS
+ 
+ all: $(EXTRA_ALL_TARGETS)
+ 	$(MAKE) -C ../asdf
+diff --git a/contrib/vanilla-module.mk b/contrib/vanilla-module.mk
+index 41c1771..4c343ee 100644
+--- a/contrib/vanilla-module.mk
++++ b/contrib/vanilla-module.mk
+@@ -1,3 +1,7 @@
++# -*- makefile -*- included by contribs that don't use ASDF
++
++# from src/runtime/
++-include platform.mk
+ 
+ $(MODULE).fasl: $(MODULE).lisp ../../output/sbcl.core
+ 	$(SBCL) --eval '(compile-file (format nil "SYS:CONTRIB;~:@(~A~);~:@(~A~).LISP" "$(MODULE)" "$(MODULE)"))' </dev/null
+diff --git a/make-target-contrib.sh b/make-target-contrib.sh
+index 85345e6..e3185d8 100644
+--- a/make-target-contrib.sh
++++ b/make-target-contrib.sh
+@@ -66,7 +66,7 @@ for i in contrib/*; do
+     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
+     test -f $i/test-passed && rm $i/test-passed
+     # hack to get exit codes right.
+-    if $GNUMAKE -C $i test 2>&1 && touch $i/test-passed ; then
++    if $GNUMAKE -C $i -I ../../src/runtime test 2>&1 && touch $i/test-passed ; then
+ 	:
+     else
+ 	exit $?
+diff --git a/src/runtime/Config.alpha-linux b/src/runtime/Config.alpha-linux
+index 42df1fc..ef140d3 100644
+--- a/src/runtime/Config.alpha-linux
++++ b/src/runtime/Config.alpha-linux
+@@ -10,7 +10,7 @@
+ # files for more information.
+ 
+ LD = ld -taso
+-LINKFLAGS += -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynamic
++LDFLAGS += -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynamic
+ NM = ./linux-nm
+ 
+ ASSEM_SRC = alpha-assem.S ldso-stubs.S
+diff --git a/src/runtime/Config.alpha-osf1 b/src/runtime/Config.alpha-osf1
+index 0553f48..8c39543 100644
+--- a/src/runtime/Config.alpha-osf1
++++ b/src/runtime/Config.alpha-osf1
+@@ -9,11 +9,10 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
+-CFLAGS += -Dosf1 -O0 -g -D_XOPEN_SOURCE=500 -D_OSF_SOURCE=500
+-CFLAGS += -msg_disable newlocale
++CFLAGS += -Dosf1 -O0 -D_XOPEN_SOURCE=500 -D_OSF_SOURCE=500 -msg_disable newlocale
+ ASFLAGS += -Dosf1 #-ULANGUAGE_ASSEMBLY
+ LD = ld -xtaso
+-LINKFLAGS = -non_shared # dynamic -v -g  -Wl,-T  -Wl,ld-script.alpha-linux
++LDFLAGS += -non_shared # dynamic -v -g  -Wl,-T  -Wl,ld-script.alpha-linux
+ # Digital^WCompaq^WHP's cc declares `static inline' functions to exist
+ # in multiple places in the binary; we add the '-g' flag to suppress all
+ # internal (i.e. static) function names being spat out.  GENESIS
+diff --git a/src/runtime/Config.hppa-hpux b/src/runtime/Config.hppa-hpux
+index fec282b..7509a60 100644
+--- a/src/runtime/Config.hppa-hpux
++++ b/src/runtime/Config.hppa-hpux
+@@ -9,7 +9,7 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
+-LINKFLAGS += -v
++LDFLAGS += -v
+ # avoid native tools
+ NM = /usr/local/bin/nm
+ CC = /usr/local/bin/gcc
+diff --git a/src/runtime/Config.hppa-linux b/src/runtime/Config.hppa-linux
+index 72449bd..4637c5c 100644
+--- a/src/runtime/Config.hppa-linux
++++ b/src/runtime/Config.hppa-linux
+@@ -9,7 +9,7 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
+-LINKFLAGS += -v -static
++LDFLAGS += -v -static
+ NM = ./linux-nm
+ 
+ ASSEM_SRC = hppa-assem.S #hppa-linux-stubs.S
+diff --git a/src/runtime/Config.mips-linux b/src/runtime/Config.mips-linux
+index 9f32f3c..01f13bc 100644
+--- a/src/runtime/Config.mips-linux
++++ b/src/runtime/Config.mips-linux
+@@ -9,7 +9,7 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
+-LINKFLAGS += -v -O2 -Wl,--export-dynamic
++LDFLAGS += -v -O2 -Wl,--export-dynamic
+ NM = ./linux-nm
+ 
+ ASSEM_SRC = mips-assem.S ldso-stubs.S
+diff --git a/src/runtime/Config.ppc-darwin b/src/runtime/Config.ppc-darwin
+index 0d3d79a..ea3eaf7 100644
+--- a/src/runtime/Config.ppc-darwin
++++ b/src/runtime/Config.ppc-darwin
+@@ -9,8 +9,8 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
+-CFLAGS = -g -Wall -O2 -fdollars-in-identifiers -mmacosx-version-min=10.4
+-LINKFLAGS += -mmacosx-version-min=10.4
++CFLAGS += -O2 -fdollars-in-identifiers -mmacosx-version-min=10.4
++LDFLAGS += -mmacosx-version-min=10.4
+ 
+ OS_SRC = bsd-os.c darwin-os.c ppc-darwin-os.c
+ 
+diff --git a/src/runtime/Config.ppc-linux b/src/runtime/Config.ppc-linux
+index f8ceded..0bfe84a 100644
+--- a/src/runtime/Config.ppc-linux
++++ b/src/runtime/Config.ppc-linux
+@@ -9,8 +9,7 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
+-CFLAGS = -g
+-LINKFLAGS += -v -rdynamic
++LDFLAGS += -v -rdynamic
+ NM = ./linux-nm
+ 
+ ASSEM_SRC = ppc-assem.S ldso-stubs.S
+diff --git a/src/runtime/Config.ppc-netbsd b/src/runtime/Config.ppc-netbsd
+index 07f668e..a17ebc7 100644
+--- a/src/runtime/Config.ppc-netbsd
++++ b/src/runtime/Config.ppc-netbsd
+@@ -9,8 +9,8 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
+-LINKFLAGS += -dynamic -export-dynamic
+-CFLAGS =  -g -Wall -O2
++LDFLAGS += -dynamic -export-dynamic
++CFLAGS += -O2
+ 
+ ASSEM_SRC = ppc-assem.S ldso-stubs.S
+ ARCH_SRC = ppc-arch.c
+diff --git a/src/runtime/Config.sparc-linux b/src/runtime/Config.sparc-linux
+index 1ad0213..96af999 100644
+--- a/src/runtime/Config.sparc-linux
++++ b/src/runtime/Config.sparc-linux
+@@ -9,8 +9,7 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
+-ASFLAGS = -g -Wall
+-LINKFLAGS += -v -rdynamic
++LDFLAGS += -v -rdynamic
+ NM = ./linux-nm
+ 
+ ASSEM_SRC = sparc-assem.S ldso-stubs.S
+diff --git a/src/runtime/Config.sparc-netbsd b/src/runtime/Config.sparc-netbsd
+index ec95cf8..7ca8cab 100644
+--- a/src/runtime/Config.sparc-netbsd
++++ b/src/runtime/Config.sparc-netbsd
+@@ -10,8 +10,8 @@
+ # files for more information.
+ 
+ CC = gcc
+-CFLAGS += -g -Wall -O2
+-LINKFLAGS += -v
++CFLAGS += -O2
++LDFLAGS += -v
+ NM = nm -t x -p
+ 
+ ASSEM_SRC = sparc-assem.S ldso-stubs.S
+diff --git a/src/runtime/Config.sparc-sunos b/src/runtime/Config.sparc-sunos
+index c5c89b8..7ca56e8 100644
+--- a/src/runtime/Config.sparc-sunos
++++ b/src/runtime/Config.sparc-sunos
+@@ -11,8 +11,8 @@
+ 
+ CC = gcc
+ CFLAGS += -DSVR4 -D_REENTRANT
+-ASFLAGS = -g -Wall -DSVR4
+-LINKFLAGS += -v
++ASFLAGS += -DSVR4
++LDFLAGS += -v
+ NM = nm -t x -p 
+ 
+ ASSEM_SRC = sparc-assem.S ldso-stubs.S
+diff --git a/src/runtime/Config.x86-64-darwin b/src/runtime/Config.x86-64-darwin
+index 24965f5..efecb06 100644
+--- a/src/runtime/Config.x86-64-darwin
++++ b/src/runtime/Config.x86-64-darwin
+@@ -9,13 +9,15 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
+-CFLAGS = -g -Wall -O2 -fdollars-in-identifiers
++CFLAGS += -arch x86_64 -O2 -fdollars-in-identifier
++LDFLAGS += -arch x86_64
++
+ ifdef LISP_FEATURE_DARWIN9_OR_BETTER
+ CFLAGS += -mmacosx-version-min=10.5
+-LINKFLAGS += -mmacosx-version-min=10.5
++LDFLAGS += -mmacosx-version-min=10.5
+ else
+ CFLAGS += -mmacosx-version-min=10.4
+-LINKFLAGS += -mmacosx-version-min=10.4
++LDFLAGS += -mmacosx-version-min=10.4
+ endif
+ ifdef LISP_FEATURE_INODE64
+ CFLAGS += -D_DARWIN_USE_64_BIT_INODE
+@@ -31,9 +33,9 @@ endif
+ ASSEM_SRC = x86-64-assem.S ldso-stubs.S
+ ARCH_SRC = x86-64-arch.c
+ 
+-LINKFLAGS += -arch x86_64 -dynamic -twolevel_namespace -bind_at_load -pagezero_size 0x100000
++LDFLAGS += -dynamic -twolevel_namespace -bind_at_load -pagezero_size 0x100000
+ 
+-CFLAGS += -arch x86_64 -fno-omit-frame-pointer -pagezero_size 0x100000
++CFLAGS += -fno-omit-frame-pointer -pagezero_size 0x100000
+ 
+ GC_SRC = gencgc.c
+ 
+diff --git a/src/runtime/Config.x86-64-freebsd b/src/runtime/Config.x86-64-freebsd
+index cb35476..2945aa5 100644
+--- a/src/runtime/Config.x86-64-freebsd
++++ b/src/runtime/Config.x86-64-freebsd
+@@ -13,11 +13,11 @@ include Config.x86-64-bsd
+ 
+ ASSEM_SRC += ldso-stubs.S
+ 
+-# Until sbcl-0.6.7.3, we used "LINKFLAGS+=-static" here, which
++# Until sbcl-0.6.7.3, we used "LDFLAGS+=-static" here, which
+ # worked fine for most things, but LOAD-FOREIGN & friends require
+ # dlopen() etc., which in turn depend on dynamic linking of the
+ # runtime.
+-LINKFLAGS += -dynamic -export-dynamic
++LDFLAGS += -dynamic -export-dynamic
+ 
+ # use libthr (1:1 threading).  libpthread (m:n threading) does not work.
+ ifdef LISP_FEATURE_SB_THREAD
+diff --git a/src/runtime/Config.x86-64-netbsd b/src/runtime/Config.x86-64-netbsd
+index e893ee0..41e66ba 100644
+--- a/src/runtime/Config.x86-64-netbsd
++++ b/src/runtime/Config.x86-64-netbsd
+@@ -14,9 +14,4 @@ include Config.x86-64-bsd
+ ASSEM_SRC += ldso-stubs.S
+ OS_LIBS += -lutil
+ 
+-# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS?
+-# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the
+-# dladdr test in tools-for-build/ to fail.
+-
+-LINKFLAGS += -export-dynamic
+ LDFLAGS += -export-dynamic
+diff --git a/src/runtime/Config.x86-64-openbsd b/src/runtime/Config.x86-64-openbsd
+index e893ee0..41e66ba 100644
+--- a/src/runtime/Config.x86-64-openbsd
++++ b/src/runtime/Config.x86-64-openbsd
+@@ -14,9 +14,4 @@ include Config.x86-64-bsd
+ ASSEM_SRC += ldso-stubs.S
+ OS_LIBS += -lutil
+ 
+-# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS?
+-# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the
+-# dladdr test in tools-for-build/ to fail.
+-
+-LINKFLAGS += -export-dynamic
+ LDFLAGS += -export-dynamic
+diff --git a/src/runtime/Config.x86-64-sunos b/src/runtime/Config.x86-64-sunos
+index 8441cef..208a4f7 100644
+--- a/src/runtime/Config.x86-64-sunos
++++ b/src/runtime/Config.x86-64-sunos
+@@ -1,14 +1,14 @@
+ CC=gcc
+-CFLAGS = -m64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
+-ASFLAGS = -m64 -Wall
++CFLAGS += -m64 -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
++ASFLAGS += -m64
+ LD = ld
+-LINKFLAGS = -m64 -g
++LDFLAGS += -m64 -g
+ NM = nm -xgp
+ GREP = ggrep
+ 
+ #CC=/opt/SunStudioExpress/bin/cc
+-#CFLAGS = -xarch=generic64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
+-#ASFLAGS = -xarch=generic64 -Wall
++#CFLAGS += -xarch=generic64 -g -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
++#ASFLAGS += -xarch=generic64
+ 
+ ASSEM_SRC = x86-64-assem.S ldso-stubs.S
+ ARCH_SRC = x86-64-arch.c
+diff --git a/src/runtime/Config.x86-darwin b/src/runtime/Config.x86-darwin
+index c1a3eb7..578f91a 100644
+--- a/src/runtime/Config.x86-darwin
++++ b/src/runtime/Config.x86-darwin
+@@ -9,14 +9,15 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
+-CFLAGS = -arch i386 -g -Wall -O2 -fdollars-in-identifiers
+-LINKFLAGS += -arch i386
++CFLAGS += -arch i386 -g -Wall -O2 -fdollars-in-identifiers
++LDFLAGS += -arch i386
++
+ ifdef LISP_FEATURE_DARWIN9_OR_BETTER
+ CFLAGS += -mmacosx-version-min=10.5
+-LINKFLAGS += -mmacosx-version-min=10.5
++LDFLAGS += -mmacosx-version-min=10.5
+ else
+ CFLAGS += -mmacosx-version-min=10.4
+-LINKFLAGS += -mmacosx-version-min=10.4
++LDFLAGS += -mmacosx-version-min=10.4
+ endif
+ 
+ OS_SRC = bsd-os.c x86-bsd-os.c darwin-os.c x86-darwin-os.c
+diff --git a/src/runtime/Config.x86-freebsd b/src/runtime/Config.x86-freebsd
+index a7533b6..2b4b8bd 100644
+--- a/src/runtime/Config.x86-freebsd
++++ b/src/runtime/Config.x86-freebsd
+@@ -13,11 +13,11 @@ include Config.x86-bsd
+ 
+ ASSEM_SRC += ldso-stubs.S
+ 
+-# Until sbcl-0.6.7.3, we used "LINKFLAGS+=-static" here, which
++# Until sbcl-0.6.7.3, we used "LDFLAGS+=-static" here, which
+ # worked fine for most things, but LOAD-FOREIGN & friends require
+ # dlopen() etc., which in turn depend on dynamic linking of the
+ # runtime.
+-LINKFLAGS += -dynamic -export-dynamic
++LDFLAGS += -dynamic -export-dynamic
+ 
+ # use libthr (1:1 threading).  libpthread (m:n threading) does not work.
+ ifdef LISP_FEATURE_SB_THREAD
+diff --git a/src/runtime/Config.x86-linux b/src/runtime/Config.x86-linux
+index d64a779..5c3bfe7 100644
+--- a/src/runtime/Config.x86-linux
++++ b/src/runtime/Config.x86-linux
+@@ -27,11 +27,11 @@ OS_SRC = linux-os.c x86-linux-os.c
+ # (You *are* encouraged to design and implement a coherent stable
+ # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
+ # working on one and it would be a nice thing to have.)
+-LINKFLAGS += -Wl,--export-dynamic
++SBCL_LDFLAGS += -Wl,--export-dynamic
+ OS_LIBS = -ldl
+ 
+ ifdef LISP_FEATURE_LARGEFILE
+-  CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++  SBCL_CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ endif
+ 
+ ifdef LISP_FEATURE_SB_THREAD
+diff --git a/src/runtime/Config.x86-netbsd b/src/runtime/Config.x86-netbsd
+index cd3782c..b0cd748 100644
+--- a/src/runtime/Config.x86-netbsd
++++ b/src/runtime/Config.x86-netbsd
+@@ -13,6 +13,6 @@ include Config.x86-bsd
+ 
+ ASSEM_SRC += ldso-stubs.S
+ OS_SRC += undefineds.c
+-LINKFLAGS += -dynamic -export-dynamic
++LDFLAGS += -dynamic -export-dynamic
+ 
+-CFLAGS =  -g -Wall -O2
++CFLAGS += -O2
+diff --git a/src/runtime/Config.x86-openbsd b/src/runtime/Config.x86-openbsd
+index b55c794..b98d701 100644
+--- a/src/runtime/Config.x86-openbsd
++++ b/src/runtime/Config.x86-openbsd
+@@ -18,11 +18,6 @@ OS_LIBS += -lutil
+ # locations used. If you wish to link the runtime using -Z option then
+ # please see the comments in src/compiler/x86/parms.lisp
+ 
+-# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS?
+-# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the
+-# dladdr test in tools-for-build/ to fail.
+-
+-LINKFLAGS += -export-dynamic
+ LDFLAGS += -export-dynamic
+ 
+-CFLAGS =  -g -Wall -O2
++CFLAGS += -O2
+diff --git a/src/runtime/Config.x86-sunos b/src/runtime/Config.x86-sunos
+index 2e58b51..fbb41aa 100644
+--- a/src/runtime/Config.x86-sunos
++++ b/src/runtime/Config.x86-sunos
+@@ -1,6 +1,5 @@
+ CC=gcc
+-CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT
+-ASFLAGS = -Wall
++CFLAGS += -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT
+ LD = ld
+ NM = nm -xgp
+ GREP = ggrep
+diff --git a/src/runtime/Config.x86-win32 b/src/runtime/Config.x86-win32
+index b341808..8d24df6 100644
+--- a/src/runtime/Config.x86-win32
++++ b/src/runtime/Config.x86-win32
+@@ -25,13 +25,13 @@ OS_SRC = win32-os.c x86-win32-os.c os-common.c
+ # (You *are* encouraged to design and implement a coherent stable
+ # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
+ # working on one and it would be a nice thing to have.)
+-OS_LINK_FLAGS = -Wl,--export-dynamic,-mno-cygwin
++OS_LINK_FLAGS += -Wl,--export-dynamic,-mno-cygwin
+ OS_LIBS = -mno-cygwin
+ 
+ GC_SRC = gencgc.c
+ 
+-CFLAGS =  -g -Wall -O3 -mno-cygwin
+-ASFLAGS = $(CFLAGS)
++CFLAGS += -O3 -mno-cygwin
++ASFLAGS += $(CFLAGS)
+ 
+ CPP = cpp
+ CC = gcc-3
+diff --git a/src/runtime/Config.x86_64-linux b/src/runtime/Config.x86_64-linux
+index e1efb79..b17bfd4 100644
+--- a/src/runtime/Config.x86_64-linux
++++ b/src/runtime/Config.x86_64-linux
+@@ -27,7 +27,7 @@ OS_SRC = linux-os.c x86-64-linux-os.c
+ # (You *are* encouraged to design and implement a coherent stable
+ # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
+ # working on one and it would be a nice thing to have.)
+-LINKFLAGS += -Wl,--export-dynamic
++LDFLAGS += -Wl,--export-dynamic
+ OS_LIBS = -ldl
+ 
+ ifdef LISP_FEATURE_LARGEFILE
+diff --git a/src/runtime/GNUmakefile b/src/runtime/GNUmakefile
+index f0fbe19..6dc0581 100644
+--- a/src/runtime/GNUmakefile
++++ b/src/runtime/GNUmakefile
+@@ -18,27 +18,19 @@ TARGET=sbcl
+ # Config file. Most of them are same on most systems right now.
+ # If you need to override one of these, do it in Config.
+ LD = ld
+-LINKFLAGS = -g
++SBCL_LDFLAGS = -g
+ NM = nm -gp
+ DEPEND_FLAGS = -MM
+ GREP = grep
+ 
+ include ../../output/prefix.def
+ 
+-CFLAGS = -g -Wall -Wsign-compare -O3
+-ASFLAGS = $(CFLAGS)
+-CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
++SBCL_CFLAGS = -g -Wall -Wsign-compare -O3
++SBCL_ASFLAGS = $(SBCL_CFLAGS)
++SBCL_CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
+ 
+-# Give make access to the target Lisp features.
+-include genesis/Makefile.features
+-
+-# The Config file is the preferred place for tweaking options which
+-# are appropriate for particular setups (OS, ARCH, whatever). Make a
+-# Config-foo file for setup foo, then arrange for Config to be a
+-# symlink to Config-foo.
+-# Commonly used variables in Config are: ARCH_SRC, ASSEM_SRC, GC_SRC,
+-# OS_SRC, OS_LIBS, OS_OBJS, OS_CLEAN_FILES
+-include Config
++# Also included by tools-for-build/Makefile
++-include platform.mk
+ 
+ COMMON_SRC = alloc.c backtrace.c breakpoint.c coreparse.c \
+ 	dynbind.c funcall.c gc-common.c globals.c interr.c interrupt.c \
+@@ -58,7 +50,7 @@ LIBS = ${OS_LIBS} -lm
+ targets: $(TARGET) sbcl.nm
+ 
+ $(TARGET): $(OBJS)
+-	$(CC) ${LINKFLAGS} -o $@ $^ $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ sbcl.nm: $(TARGET)
+ 	$(NM) $(TARGET) | $(GREP) -v " [FUw] " > ,$@
+diff --git a/src/runtime/platform.mk b/src/runtime/platform.mk
+new file mode 100644
+index 0000000..d2470cd
+--- /dev/null
++++ b/src/runtime/platform.mk
+@@ -0,0 +1,17 @@
++# -*- makefile -*- for the C-level run-time support for SBCL
++
++# Give make access to the target Lisp features.
++-include genesis/Makefile.features
++
++# The Config file is the preferred place for tweaking options which
++# are appropriate for particular setups (OS, ARCH, whatever). Make a
++# Config-foo file for setup foo, then arrange for Config to be a
++# symlink to Config-foo.
++# Commonly used variables in Config are: ARCH_SRC, ASSEM_SRC, GC_SRC,
++# OS_SRC, OS_LIBS, OS_OBJS, OS_CLEAN_FILES
++-include Config
++
++CPPFLAGS := $(SBCL_CPPFLAGS) $(CPPFLAGS)
++CFLAGS   := $(SBCL_CFLAGS)   $(CFLAGS)
++ASFLAGS  := $(SBCL_ASFLAGS)  $(ASFLAGS)
++LDFLAGS  := $(SBCL_LDFLAGS)  $(LDFLAGS)
+diff --git a/tools-for-build/Makefile b/tools-for-build/Makefile
+index 7a4c16f..dc99ebc 100644
+--- a/tools-for-build/Makefile
++++ b/tools-for-build/Makefile
+@@ -7,12 +7,11 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
+--include genesis/Makefile.features
+--include Config
++SBCL_CPPFLAGS = -I../src/runtime
++SBCL_LDFLAGS = $(OS_LIBS)
+ 
+-CPPFLAGS:=-I../src/runtime
+-LDFLAGS:=$(LDFLAGS)
+-LDLIBS:=$(OS_LIBS)
++# from src/runtime/
++-include platform.mk
+ 
+ all: grovel-headers determine-endianness where-is-mcontext \
+         modify-ldt-struct-name sigaction-sa-nodefer-works-test

diff --git a/dev-lisp/sbcl/sbcl-1.0.45.ebuild b/dev-lisp/sbcl/sbcl-1.0.47.ebuild
similarity index 99%
rename from dev-lisp/sbcl/sbcl-1.0.45.ebuild
rename to dev-lisp/sbcl/sbcl-1.0.47.ebuild
index 527f51e..f4f6f69 100644
--- a/dev-lisp/sbcl/sbcl-1.0.45.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.0.47.ebuild
@@ -104,7 +104,6 @@ src_compile() {
 	local bindir="${WORKDIR}"/sbcl-binary
 
 	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
-	append-ldflags -Wl,--no-as-needed # see bug #132992
 
 	# To make the hardened compiler NOT compile with -fPIE -pie
 	if gcc-specs-pie ; then



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
@ 2011-06-08 16:20 Stelian Ionescu
  0 siblings, 0 replies; 13+ messages in thread
From: Stelian Ionescu @ 2011-06-08 16:20 UTC (permalink / raw
  To: gentoo-commits

commit:     70a4ca4b3369f720ef07ca084afe15cb3262212b
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Wed Jun  8 16:04:54 2011 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Wed Jun  8 16:04:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=70a4ca4b

dev-lisp/sbcl: bump to version 1.0.49

---
 .../files/1.0.45-gentoo-fix_build_system.patch     |  557 --------------------
 ....patch => 1.0.49-gentoo-fix_build_system.patch} |  279 +++++------
 dev-lisp/sbcl/sbcl-1.0.47.ebuild                   |  183 -------
 .../{sbcl-1.0.45-r1.ebuild => sbcl-1.0.49.ebuild}  |    0
 4 files changed, 125 insertions(+), 894 deletions(-)

diff --git a/dev-lisp/sbcl/files/1.0.45-gentoo-fix_build_system.patch b/dev-lisp/sbcl/files/1.0.45-gentoo-fix_build_system.patch
deleted file mode 100644
index 1e80425..0000000
--- a/dev-lisp/sbcl/files/1.0.45-gentoo-fix_build_system.patch
+++ /dev/null
@@ -1,557 +0,0 @@
-diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
-index b6edb51..59b144a 100644
---- a/contrib/asdf-module.mk
-+++ b/contrib/asdf-module.mk
-@@ -1,3 +1,5 @@
-+# -*- makefile -*- included by contribs built with ASDF
-+
- CC=gcc
- 
- # We need to extend flags to the C compiler and the linker
-@@ -7,6 +9,9 @@ CC=gcc
- # directly via ASDF from a non-C-aware module which has these tricky
- # ones as dependencies.
- 
-+# from src/runtime/
-+-include platform.mk
-+
- UNAME:=$(shell uname -s)
- 
- ifeq (SunOS,$(UNAME))
-@@ -21,7 +26,9 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
-   CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC))))
- endif
- 
--export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
-+EXTRA_CFLAGS += $(CFLAGS)
-+
-+export CC SBCL EXTRA_CFLAGS
- 
- all: $(EXTRA_ALL_TARGETS)
- 	$(MAKE) -C ../asdf
-diff --git a/contrib/vanilla-module.mk b/contrib/vanilla-module.mk
-index 41c1771..4c343ee 100644
---- a/contrib/vanilla-module.mk
-+++ b/contrib/vanilla-module.mk
-@@ -1,3 +1,7 @@
-+# -*- makefile -*- included by contribs that don't use ASDF
-+
-+# from src/runtime/
-+-include platform.mk
- 
- $(MODULE).fasl: $(MODULE).lisp ../../output/sbcl.core
- 	$(SBCL) --eval '(compile-file (format nil "SYS:CONTRIB;~:@(~A~);~:@(~A~).LISP" "$(MODULE)" "$(MODULE)"))' </dev/null
-diff --git a/make-target-contrib.sh b/make-target-contrib.sh
-index bd9f640..c7c021e 100644
---- a/make-target-contrib.sh
-+++ b/make-target-contrib.sh
-@@ -62,7 +62,7 @@ for i in contrib/*; do
-     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
-     test -f $i/test-passed && rm $i/test-passed
-     # hack to get exit codes right.
--    if $GNUMAKE -C $i test 2>&1 && touch $i/test-passed ; then
-+    if $GNUMAKE -C $i -I ../../src/runtime test 2>&1 && touch $i/test-passed ; then
- 	:
-     else
- 	exit $?
-diff --git a/src/runtime/Config.alpha-linux b/src/runtime/Config.alpha-linux
-index 42df1fc..ef140d3 100644
---- a/src/runtime/Config.alpha-linux
-+++ b/src/runtime/Config.alpha-linux
-@@ -10,7 +10,7 @@
- # files for more information.
- 
- LD = ld -taso
--LINKFLAGS += -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynamic
-+LDFLAGS += -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynamic
- NM = ./linux-nm
- 
- ASSEM_SRC = alpha-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.alpha-osf1 b/src/runtime/Config.alpha-osf1
-index 0553f48..8c39543 100644
---- a/src/runtime/Config.alpha-osf1
-+++ b/src/runtime/Config.alpha-osf1
-@@ -9,11 +9,10 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--CFLAGS += -Dosf1 -O0 -g -D_XOPEN_SOURCE=500 -D_OSF_SOURCE=500
--CFLAGS += -msg_disable newlocale
-+CFLAGS += -Dosf1 -O0 -D_XOPEN_SOURCE=500 -D_OSF_SOURCE=500 -msg_disable newlocale
- ASFLAGS += -Dosf1 #-ULANGUAGE_ASSEMBLY
- LD = ld -xtaso
--LINKFLAGS = -non_shared # dynamic -v -g  -Wl,-T  -Wl,ld-script.alpha-linux
-+LDFLAGS += -non_shared # dynamic -v -g  -Wl,-T  -Wl,ld-script.alpha-linux
- # Digital^WCompaq^WHP's cc declares `static inline' functions to exist
- # in multiple places in the binary; we add the '-g' flag to suppress all
- # internal (i.e. static) function names being spat out.  GENESIS
-diff --git a/src/runtime/Config.hppa-hpux b/src/runtime/Config.hppa-hpux
-index fec282b..7509a60 100644
---- a/src/runtime/Config.hppa-hpux
-+++ b/src/runtime/Config.hppa-hpux
-@@ -9,7 +9,7 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--LINKFLAGS += -v
-+LDFLAGS += -v
- # avoid native tools
- NM = /usr/local/bin/nm
- CC = /usr/local/bin/gcc
-diff --git a/src/runtime/Config.hppa-linux b/src/runtime/Config.hppa-linux
-index 72449bd..4637c5c 100644
---- a/src/runtime/Config.hppa-linux
-+++ b/src/runtime/Config.hppa-linux
-@@ -9,7 +9,7 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--LINKFLAGS += -v -static
-+LDFLAGS += -v -static
- NM = ./linux-nm
- 
- ASSEM_SRC = hppa-assem.S #hppa-linux-stubs.S
-diff --git a/src/runtime/Config.mips-linux b/src/runtime/Config.mips-linux
-index 9f32f3c..01f13bc 100644
---- a/src/runtime/Config.mips-linux
-+++ b/src/runtime/Config.mips-linux
-@@ -9,7 +9,7 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--LINKFLAGS += -v -O2 -Wl,--export-dynamic
-+LDFLAGS += -v -O2 -Wl,--export-dynamic
- NM = ./linux-nm
- 
- ASSEM_SRC = mips-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.ppc-darwin b/src/runtime/Config.ppc-darwin
-index 0d3d79a..ea3eaf7 100644
---- a/src/runtime/Config.ppc-darwin
-+++ b/src/runtime/Config.ppc-darwin
-@@ -9,8 +9,8 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--CFLAGS = -g -Wall -O2 -fdollars-in-identifiers -mmacosx-version-min=10.4
--LINKFLAGS += -mmacosx-version-min=10.4
-+CFLAGS += -O2 -fdollars-in-identifiers -mmacosx-version-min=10.4
-+LDFLAGS += -mmacosx-version-min=10.4
- 
- OS_SRC = bsd-os.c darwin-os.c ppc-darwin-os.c
- 
-diff --git a/src/runtime/Config.ppc-linux b/src/runtime/Config.ppc-linux
-index f8ceded..0bfe84a 100644
---- a/src/runtime/Config.ppc-linux
-+++ b/src/runtime/Config.ppc-linux
-@@ -9,8 +9,7 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--CFLAGS = -g
--LINKFLAGS += -v -rdynamic
-+LDFLAGS += -v -rdynamic
- NM = ./linux-nm
- 
- ASSEM_SRC = ppc-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.ppc-netbsd b/src/runtime/Config.ppc-netbsd
-index 07f668e..a17ebc7 100644
---- a/src/runtime/Config.ppc-netbsd
-+++ b/src/runtime/Config.ppc-netbsd
-@@ -9,8 +9,8 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--LINKFLAGS += -dynamic -export-dynamic
--CFLAGS =  -g -Wall -O2
-+LDFLAGS += -dynamic -export-dynamic
-+CFLAGS += -O2
- 
- ASSEM_SRC = ppc-assem.S ldso-stubs.S
- ARCH_SRC = ppc-arch.c
-diff --git a/src/runtime/Config.sparc-linux b/src/runtime/Config.sparc-linux
-index 1ad0213..96af999 100644
---- a/src/runtime/Config.sparc-linux
-+++ b/src/runtime/Config.sparc-linux
-@@ -9,8 +9,7 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--ASFLAGS = -g -Wall
--LINKFLAGS += -v -rdynamic
-+LDFLAGS += -v -rdynamic
- NM = ./linux-nm
- 
- ASSEM_SRC = sparc-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.sparc-netbsd b/src/runtime/Config.sparc-netbsd
-index ec95cf8..7ca8cab 100644
---- a/src/runtime/Config.sparc-netbsd
-+++ b/src/runtime/Config.sparc-netbsd
-@@ -10,8 +10,8 @@
- # files for more information.
- 
- CC = gcc
--CFLAGS += -g -Wall -O2
--LINKFLAGS += -v
-+CFLAGS += -O2
-+LDFLAGS += -v
- NM = nm -t x -p
- 
- ASSEM_SRC = sparc-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.sparc-sunos b/src/runtime/Config.sparc-sunos
-index c5c89b8..7ca56e8 100644
---- a/src/runtime/Config.sparc-sunos
-+++ b/src/runtime/Config.sparc-sunos
-@@ -11,8 +11,8 @@
- 
- CC = gcc
- CFLAGS += -DSVR4 -D_REENTRANT
--ASFLAGS = -g -Wall -DSVR4
--LINKFLAGS += -v
-+ASFLAGS += -DSVR4
-+LDFLAGS += -v
- NM = nm -t x -p 
- 
- ASSEM_SRC = sparc-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.x86-64-darwin b/src/runtime/Config.x86-64-darwin
-index 24965f5..efecb06 100644
---- a/src/runtime/Config.x86-64-darwin
-+++ b/src/runtime/Config.x86-64-darwin
-@@ -9,13 +9,15 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--CFLAGS = -g -Wall -O2 -fdollars-in-identifiers
-+CFLAGS += -arch x86_64 -O2 -fdollars-in-identifier
-+LDFLAGS += -arch x86_64
-+
- ifdef LISP_FEATURE_DARWIN9_OR_BETTER
- CFLAGS += -mmacosx-version-min=10.5
--LINKFLAGS += -mmacosx-version-min=10.5
-+LDFLAGS += -mmacosx-version-min=10.5
- else
- CFLAGS += -mmacosx-version-min=10.4
--LINKFLAGS += -mmacosx-version-min=10.4
-+LDFLAGS += -mmacosx-version-min=10.4
- endif
- ifdef LISP_FEATURE_INODE64
- CFLAGS += -D_DARWIN_USE_64_BIT_INODE
-@@ -31,9 +33,9 @@ endif
- ASSEM_SRC = x86-64-assem.S ldso-stubs.S
- ARCH_SRC = x86-64-arch.c
- 
--LINKFLAGS += -arch x86_64 -dynamic -twolevel_namespace -bind_at_load -pagezero_size 0x100000
-+LDFLAGS += -dynamic -twolevel_namespace -bind_at_load -pagezero_size 0x100000
- 
--CFLAGS += -arch x86_64 -fno-omit-frame-pointer -pagezero_size 0x100000
-+CFLAGS += -fno-omit-frame-pointer -pagezero_size 0x100000
- 
- GC_SRC = gencgc.c
- 
-diff --git a/src/runtime/Config.x86-64-freebsd b/src/runtime/Config.x86-64-freebsd
-index cb35476..2945aa5 100644
---- a/src/runtime/Config.x86-64-freebsd
-+++ b/src/runtime/Config.x86-64-freebsd
-@@ -13,11 +13,11 @@ include Config.x86-64-bsd
- 
- ASSEM_SRC += ldso-stubs.S
- 
--# Until sbcl-0.6.7.3, we used "LINKFLAGS+=-static" here, which
-+# Until sbcl-0.6.7.3, we used "LDFLAGS+=-static" here, which
- # worked fine for most things, but LOAD-FOREIGN & friends require
- # dlopen() etc., which in turn depend on dynamic linking of the
- # runtime.
--LINKFLAGS += -dynamic -export-dynamic
-+LDFLAGS += -dynamic -export-dynamic
- 
- # use libthr (1:1 threading).  libpthread (m:n threading) does not work.
- ifdef LISP_FEATURE_SB_THREAD
-diff --git a/src/runtime/Config.x86-64-netbsd b/src/runtime/Config.x86-64-netbsd
-index e893ee0..41e66ba 100644
---- a/src/runtime/Config.x86-64-netbsd
-+++ b/src/runtime/Config.x86-64-netbsd
-@@ -14,9 +14,4 @@ include Config.x86-64-bsd
- ASSEM_SRC += ldso-stubs.S
- OS_LIBS += -lutil
- 
--# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS?
--# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the
--# dladdr test in tools-for-build/ to fail.
--
--LINKFLAGS += -export-dynamic
- LDFLAGS += -export-dynamic
-diff --git a/src/runtime/Config.x86-64-openbsd b/src/runtime/Config.x86-64-openbsd
-index e893ee0..41e66ba 100644
---- a/src/runtime/Config.x86-64-openbsd
-+++ b/src/runtime/Config.x86-64-openbsd
-@@ -14,9 +14,4 @@ include Config.x86-64-bsd
- ASSEM_SRC += ldso-stubs.S
- OS_LIBS += -lutil
- 
--# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS?
--# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the
--# dladdr test in tools-for-build/ to fail.
--
--LINKFLAGS += -export-dynamic
- LDFLAGS += -export-dynamic
-diff --git a/src/runtime/Config.x86-64-sunos b/src/runtime/Config.x86-64-sunos
-index 8441cef..208a4f7 100644
---- a/src/runtime/Config.x86-64-sunos
-+++ b/src/runtime/Config.x86-64-sunos
-@@ -1,14 +1,14 @@
- CC=gcc
--CFLAGS = -m64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
--ASFLAGS = -m64 -Wall
-+CFLAGS += -m64 -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
-+ASFLAGS += -m64
- LD = ld
--LINKFLAGS = -m64 -g
-+LDFLAGS += -m64 -g
- NM = nm -xgp
- GREP = ggrep
- 
- #CC=/opt/SunStudioExpress/bin/cc
--#CFLAGS = -xarch=generic64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
--#ASFLAGS = -xarch=generic64 -Wall
-+#CFLAGS += -xarch=generic64 -g -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
-+#ASFLAGS += -xarch=generic64
- 
- ASSEM_SRC = x86-64-assem.S ldso-stubs.S
- ARCH_SRC = x86-64-arch.c
-diff --git a/src/runtime/Config.x86-darwin b/src/runtime/Config.x86-darwin
-index c1a3eb7..578f91a 100644
---- a/src/runtime/Config.x86-darwin
-+++ b/src/runtime/Config.x86-darwin
-@@ -9,14 +9,15 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--CFLAGS = -arch i386 -g -Wall -O2 -fdollars-in-identifiers
--LINKFLAGS += -arch i386
-+CFLAGS += -arch i386 -g -Wall -O2 -fdollars-in-identifiers
-+LDFLAGS += -arch i386
-+
- ifdef LISP_FEATURE_DARWIN9_OR_BETTER
- CFLAGS += -mmacosx-version-min=10.5
--LINKFLAGS += -mmacosx-version-min=10.5
-+LDFLAGS += -mmacosx-version-min=10.5
- else
- CFLAGS += -mmacosx-version-min=10.4
--LINKFLAGS += -mmacosx-version-min=10.4
-+LDFLAGS += -mmacosx-version-min=10.4
- endif
- 
- OS_SRC = bsd-os.c x86-bsd-os.c darwin-os.c x86-darwin-os.c
-diff --git a/src/runtime/Config.x86-freebsd b/src/runtime/Config.x86-freebsd
-index a7533b6..2b4b8bd 100644
---- a/src/runtime/Config.x86-freebsd
-+++ b/src/runtime/Config.x86-freebsd
-@@ -13,11 +13,11 @@ include Config.x86-bsd
- 
- ASSEM_SRC += ldso-stubs.S
- 
--# Until sbcl-0.6.7.3, we used "LINKFLAGS+=-static" here, which
-+# Until sbcl-0.6.7.3, we used "LDFLAGS+=-static" here, which
- # worked fine for most things, but LOAD-FOREIGN & friends require
- # dlopen() etc., which in turn depend on dynamic linking of the
- # runtime.
--LINKFLAGS += -dynamic -export-dynamic
-+LDFLAGS += -dynamic -export-dynamic
- 
- # use libthr (1:1 threading).  libpthread (m:n threading) does not work.
- ifdef LISP_FEATURE_SB_THREAD
-diff --git a/src/runtime/Config.x86-linux b/src/runtime/Config.x86-linux
-index d64a779..5c3bfe7 100644
---- a/src/runtime/Config.x86-linux
-+++ b/src/runtime/Config.x86-linux
-@@ -27,11 +27,11 @@ OS_SRC = linux-os.c x86-linux-os.c
- # (You *are* encouraged to design and implement a coherent stable
- # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
- # working on one and it would be a nice thing to have.)
--LINKFLAGS += -Wl,--export-dynamic
-+SBCL_LDFLAGS += -Wl,--export-dynamic
- OS_LIBS = -ldl
- 
- ifdef LISP_FEATURE_LARGEFILE
--  CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+  SBCL_CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- endif
- 
- ifdef LISP_FEATURE_SB_THREAD
-diff --git a/src/runtime/Config.x86-netbsd b/src/runtime/Config.x86-netbsd
-index cd3782c..b0cd748 100644
---- a/src/runtime/Config.x86-netbsd
-+++ b/src/runtime/Config.x86-netbsd
-@@ -13,6 +13,6 @@ include Config.x86-bsd
- 
- ASSEM_SRC += ldso-stubs.S
- OS_SRC += undefineds.c
--LINKFLAGS += -dynamic -export-dynamic
-+LDFLAGS += -dynamic -export-dynamic
- 
--CFLAGS =  -g -Wall -O2
-+CFLAGS += -O2
-diff --git a/src/runtime/Config.x86-openbsd b/src/runtime/Config.x86-openbsd
-index b55c794..b98d701 100644
---- a/src/runtime/Config.x86-openbsd
-+++ b/src/runtime/Config.x86-openbsd
-@@ -18,11 +18,6 @@ OS_LIBS += -lutil
- # locations used. If you wish to link the runtime using -Z option then
- # please see the comments in src/compiler/x86/parms.lisp
- 
--# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS?
--# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the
--# dladdr test in tools-for-build/ to fail.
--
--LINKFLAGS += -export-dynamic
- LDFLAGS += -export-dynamic
- 
--CFLAGS =  -g -Wall -O2
-+CFLAGS += -O2
-diff --git a/src/runtime/Config.x86-sunos b/src/runtime/Config.x86-sunos
-index 2e58b51..fbb41aa 100644
---- a/src/runtime/Config.x86-sunos
-+++ b/src/runtime/Config.x86-sunos
-@@ -1,6 +1,5 @@
- CC=gcc
--CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT
--ASFLAGS = -Wall
-+CFLAGS += -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT
- LD = ld
- NM = nm -xgp
- GREP = ggrep
-diff --git a/src/runtime/Config.x86-win32 b/src/runtime/Config.x86-win32
-index 2eac98b..c5ece2b 100644
---- a/src/runtime/Config.x86-win32
-+++ b/src/runtime/Config.x86-win32
-@@ -25,13 +25,13 @@ OS_SRC = win32-os.c x86-win32-os.c os-common.c
- # (You *are* encouraged to design and implement a coherent stable
- # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
- # working on one and it would be a nice thing to have.)
--OS_LINK_FLAGS = -Wl,--export-dynamic,-mno-cygwin
-+OS_LINK_FLAGS += -Wl,--export-dynamic,-mno-cygwin
- OS_LIBS = -mno-cygwin
- 
- GC_SRC = gencgc.c
- 
--CFLAGS =  -g -Wall -O3 -mno-cygwin
--ASFLAGS = $(CFLAGS)
-+CFLAGS += -O3 -mno-cygwin
-+ASFLAGS += $(CFLAGS)
- 
- CPP = cpp
- CC = gcc
-diff --git a/src/runtime/Config.x86_64-linux b/src/runtime/Config.x86_64-linux
-index e1efb79..b17bfd4 100644
---- a/src/runtime/Config.x86_64-linux
-+++ b/src/runtime/Config.x86_64-linux
-@@ -27,7 +27,7 @@ OS_SRC = linux-os.c x86-64-linux-os.c
- # (You *are* encouraged to design and implement a coherent stable
- # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
- # working on one and it would be a nice thing to have.)
--LINKFLAGS += -Wl,--export-dynamic
-+LDFLAGS += -Wl,--export-dynamic
- OS_LIBS = -ldl
- 
- ifdef LISP_FEATURE_LARGEFILE
-diff --git a/src/runtime/GNUmakefile b/src/runtime/GNUmakefile
-index f0fbe19..6dc0581 100644
---- a/src/runtime/GNUmakefile
-+++ b/src/runtime/GNUmakefile
-@@ -18,27 +18,19 @@ TARGET=sbcl
- # Config file. Most of them are same on most systems right now.
- # If you need to override one of these, do it in Config.
- LD = ld
--LINKFLAGS = -g
-+SBCL_LDFLAGS = -g
- NM = nm -gp
- DEPEND_FLAGS = -MM
- GREP = grep
- 
- include ../../output/prefix.def
- 
--CFLAGS = -g -Wall -Wsign-compare -O3
--ASFLAGS = $(CFLAGS)
--CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
-+SBCL_CFLAGS = -g -Wall -Wsign-compare -O3
-+SBCL_ASFLAGS = $(SBCL_CFLAGS)
-+SBCL_CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
- 
--# Give make access to the target Lisp features.
--include genesis/Makefile.features
--
--# The Config file is the preferred place for tweaking options which
--# are appropriate for particular setups (OS, ARCH, whatever). Make a
--# Config-foo file for setup foo, then arrange for Config to be a
--# symlink to Config-foo.
--# Commonly used variables in Config are: ARCH_SRC, ASSEM_SRC, GC_SRC,
--# OS_SRC, OS_LIBS, OS_OBJS, OS_CLEAN_FILES
--include Config
-+# Also included by tools-for-build/Makefile
-+-include platform.mk
- 
- COMMON_SRC = alloc.c backtrace.c breakpoint.c coreparse.c \
- 	dynbind.c funcall.c gc-common.c globals.c interr.c interrupt.c \
-@@ -58,7 +50,7 @@ LIBS = ${OS_LIBS} -lm
- targets: $(TARGET) sbcl.nm
- 
- $(TARGET): $(OBJS)
--	$(CC) ${LINKFLAGS} -o $@ $^ $(LIBS)
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- sbcl.nm: $(TARGET)
- 	$(NM) $(TARGET) | $(GREP) -v " [FUw] " > ,$@
-diff --git a/src/runtime/platform.mk b/src/runtime/platform.mk
-new file mode 100644
-index 0000000..d2470cd
---- /dev/null
-+++ b/src/runtime/platform.mk
-@@ -0,0 +1,17 @@
-+# -*- makefile -*- for the C-level run-time support for SBCL
-+
-+# Give make access to the target Lisp features.
-+-include genesis/Makefile.features
-+
-+# The Config file is the preferred place for tweaking options which
-+# are appropriate for particular setups (OS, ARCH, whatever). Make a
-+# Config-foo file for setup foo, then arrange for Config to be a
-+# symlink to Config-foo.
-+# Commonly used variables in Config are: ARCH_SRC, ASSEM_SRC, GC_SRC,
-+# OS_SRC, OS_LIBS, OS_OBJS, OS_CLEAN_FILES
-+-include Config
-+
-+CPPFLAGS := $(SBCL_CPPFLAGS) $(CPPFLAGS)
-+CFLAGS   := $(SBCL_CFLAGS)   $(CFLAGS)
-+ASFLAGS  := $(SBCL_ASFLAGS)  $(ASFLAGS)
-+LDFLAGS  := $(SBCL_LDFLAGS)  $(LDFLAGS)
-diff --git a/tools-for-build/Makefile b/tools-for-build/Makefile
-index 2f10a8b..dc99ebc 100644
---- a/tools-for-build/Makefile
-+++ b/tools-for-build/Makefile
-@@ -7,11 +7,11 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
---include genesis/Makefile.features
---include Config
-+SBCL_CPPFLAGS = -I../src/runtime
-+SBCL_LDFLAGS = $(OS_LIBS)
- 
--CPPFLAGS:=-I../src/runtime
--LDFLAGS:=$(LDFLAGS) $(OS_LIBS)
-+# from src/runtime/
-+-include platform.mk
- 
- all: grovel-headers determine-endianness where-is-mcontext \
-         modify-ldt-struct-name sigaction-sa-nodefer-works-test
-diff --git a/tools-for-build/ldso-stubs.lisp b/tools-for-build/ldso-stubs.lisp
-index 5d9e0d7..95a7d67 100644
---- a/tools-for-build/ldso-stubs.lisp
-+++ b/tools-for-build/ldso-stubs.lisp
-@@ -294,6 +294,7 @@ ldso_stub__ ## fct: ;                  \\
-                    "unlink"
-                    "utimes"
-                    "wait3"
-+                   "waitpid"
-                    "write")
-                  ;; These aren't needed on the X86 because they're microcoded into the
-                  ;; FPU, so the Lisp VOPs can implement them directly without having to

diff --git a/dev-lisp/sbcl/files/1.0.47-gentoo-fix_build_system.patch b/dev-lisp/sbcl/files/1.0.49-gentoo-fix_build_system.patch
similarity index 60%
rename from dev-lisp/sbcl/files/1.0.47-gentoo-fix_build_system.patch
rename to dev-lisp/sbcl/files/1.0.49-gentoo-fix_build_system.patch
index 3921255..fbfcff2 100644
--- a/dev-lisp/sbcl/files/1.0.47-gentoo-fix_build_system.patch
+++ b/dev-lisp/sbcl/files/1.0.49-gentoo-fix_build_system.patch
@@ -1,14 +1,13 @@
-diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
-index d3ffbad..7a5936e 100644
---- a/contrib/asdf-module.mk
-+++ b/contrib/asdf-module.mk
+diff -Naur sbcl-1.0.49.orig/contrib/asdf-module.mk sbcl-1.0.49/contrib/asdf-module.mk
+--- sbcl-1.0.49.orig/contrib/asdf-module.mk	2011-06-05 21:35:33.000000000 +0200
++++ sbcl-1.0.49/contrib/asdf-module.mk	2011-06-08 17:50:43.402210614 +0200
 @@ -1,3 +1,5 @@
 +# -*- makefile -*- included by contribs built with ASDF
 +
  CC=gcc
  
  # We need to extend flags to the C compiler and the linker
-@@ -7,6 +9,9 @@ CC=gcc
+@@ -7,6 +9,9 @@
  # directly via ASDF from a non-C-aware module which has these tricky
  # ones as dependencies.
  
@@ -18,7 +17,7 @@ index d3ffbad..7a5936e 100644
  UNAME:=$(shell uname -s)
  
  ifeq (SunOS,$(UNAME))
-@@ -23,7 +28,9 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
+@@ -23,7 +28,9 @@
    CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC))))
  endif
  
@@ -29,10 +28,9 @@ index d3ffbad..7a5936e 100644
  
  all: $(EXTRA_ALL_TARGETS)
  	$(MAKE) -C ../asdf
-diff --git a/contrib/vanilla-module.mk b/contrib/vanilla-module.mk
-index 41c1771..4c343ee 100644
---- a/contrib/vanilla-module.mk
-+++ b/contrib/vanilla-module.mk
+diff -Naur sbcl-1.0.49.orig/contrib/vanilla-module.mk sbcl-1.0.49/contrib/vanilla-module.mk
+--- sbcl-1.0.49.orig/contrib/vanilla-module.mk	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/contrib/vanilla-module.mk	2011-06-08 17:50:43.405543933 +0200
 @@ -1,3 +1,7 @@
 +# -*- makefile -*- included by contribs that don't use ASDF
 +
@@ -41,11 +39,10 @@ index 41c1771..4c343ee 100644
  
  $(MODULE).fasl: $(MODULE).lisp ../../output/sbcl.core
  	$(SBCL) --eval '(compile-file (format nil "SYS:CONTRIB;~:@(~A~);~:@(~A~).LISP" "$(MODULE)" "$(MODULE)"))' </dev/null
-diff --git a/make-target-contrib.sh b/make-target-contrib.sh
-index 85345e6..e3185d8 100644
---- a/make-target-contrib.sh
-+++ b/make-target-contrib.sh
-@@ -66,7 +66,7 @@ for i in contrib/*; do
+diff -Naur sbcl-1.0.49.orig/make-target-contrib.sh sbcl-1.0.49/make-target-contrib.sh
+--- sbcl-1.0.49.orig/make-target-contrib.sh	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/make-target-contrib.sh	2011-06-08 17:50:43.405543933 +0200
+@@ -66,7 +66,7 @@
      # export INSTALL_DIR=$SBCL_HOME/`basename $i `
      test -f $i/test-passed && rm $i/test-passed
      # hack to get exit codes right.
@@ -54,10 +51,9 @@ index 85345e6..e3185d8 100644
  	:
      else
  	exit $?
-diff --git a/src/runtime/Config.alpha-linux b/src/runtime/Config.alpha-linux
-index 42df1fc..ef140d3 100644
---- a/src/runtime/Config.alpha-linux
-+++ b/src/runtime/Config.alpha-linux
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.alpha-linux sbcl-1.0.49/src/runtime/Config.alpha-linux
+--- sbcl-1.0.49.orig/src/runtime/Config.alpha-linux	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.alpha-linux	2011-06-08 17:50:43.405543933 +0200
 @@ -10,7 +10,7 @@
  # files for more information.
  
@@ -67,10 +63,9 @@ index 42df1fc..ef140d3 100644
  NM = ./linux-nm
  
  ASSEM_SRC = alpha-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.alpha-osf1 b/src/runtime/Config.alpha-osf1
-index 0553f48..8c39543 100644
---- a/src/runtime/Config.alpha-osf1
-+++ b/src/runtime/Config.alpha-osf1
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.alpha-osf1 sbcl-1.0.49/src/runtime/Config.alpha-osf1
+--- sbcl-1.0.49.orig/src/runtime/Config.alpha-osf1	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.alpha-osf1	2011-06-08 17:50:43.405543933 +0200
 @@ -9,11 +9,10 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -85,10 +80,9 @@ index 0553f48..8c39543 100644
  # Digital^WCompaq^WHP's cc declares `static inline' functions to exist
  # in multiple places in the binary; we add the '-g' flag to suppress all
  # internal (i.e. static) function names being spat out.  GENESIS
-diff --git a/src/runtime/Config.hppa-hpux b/src/runtime/Config.hppa-hpux
-index fec282b..7509a60 100644
---- a/src/runtime/Config.hppa-hpux
-+++ b/src/runtime/Config.hppa-hpux
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.hppa-hpux sbcl-1.0.49/src/runtime/Config.hppa-hpux
+--- sbcl-1.0.49.orig/src/runtime/Config.hppa-hpux	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.hppa-hpux	2011-06-08 17:50:43.408877251 +0200
 @@ -9,7 +9,7 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -98,10 +92,9 @@ index fec282b..7509a60 100644
  # avoid native tools
  NM = /usr/local/bin/nm
  CC = /usr/local/bin/gcc
-diff --git a/src/runtime/Config.hppa-linux b/src/runtime/Config.hppa-linux
-index 72449bd..4637c5c 100644
---- a/src/runtime/Config.hppa-linux
-+++ b/src/runtime/Config.hppa-linux
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.hppa-linux sbcl-1.0.49/src/runtime/Config.hppa-linux
+--- sbcl-1.0.49.orig/src/runtime/Config.hppa-linux	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.hppa-linux	2011-06-08 17:50:43.408877251 +0200
 @@ -9,7 +9,7 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -111,10 +104,9 @@ index 72449bd..4637c5c 100644
  NM = ./linux-nm
  
  ASSEM_SRC = hppa-assem.S #hppa-linux-stubs.S
-diff --git a/src/runtime/Config.mips-linux b/src/runtime/Config.mips-linux
-index 9f32f3c..01f13bc 100644
---- a/src/runtime/Config.mips-linux
-+++ b/src/runtime/Config.mips-linux
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.mips-linux sbcl-1.0.49/src/runtime/Config.mips-linux
+--- sbcl-1.0.49.orig/src/runtime/Config.mips-linux	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.mips-linux	2011-06-08 17:50:43.408877251 +0200
 @@ -9,7 +9,7 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -124,10 +116,9 @@ index 9f32f3c..01f13bc 100644
  NM = ./linux-nm
  
  ASSEM_SRC = mips-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.ppc-darwin b/src/runtime/Config.ppc-darwin
-index 0d3d79a..ea3eaf7 100644
---- a/src/runtime/Config.ppc-darwin
-+++ b/src/runtime/Config.ppc-darwin
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.ppc-darwin sbcl-1.0.49/src/runtime/Config.ppc-darwin
+--- sbcl-1.0.49.orig/src/runtime/Config.ppc-darwin	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.ppc-darwin	2011-06-08 17:50:43.408877251 +0200
 @@ -9,8 +9,8 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -139,10 +130,9 @@ index 0d3d79a..ea3eaf7 100644
  
  OS_SRC = bsd-os.c darwin-os.c ppc-darwin-os.c
  
-diff --git a/src/runtime/Config.ppc-linux b/src/runtime/Config.ppc-linux
-index f8ceded..0bfe84a 100644
---- a/src/runtime/Config.ppc-linux
-+++ b/src/runtime/Config.ppc-linux
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.ppc-linux sbcl-1.0.49/src/runtime/Config.ppc-linux
+--- sbcl-1.0.49.orig/src/runtime/Config.ppc-linux	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.ppc-linux	2011-06-08 17:50:43.412210569 +0200
 @@ -9,8 +9,7 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -153,10 +143,9 @@ index f8ceded..0bfe84a 100644
  NM = ./linux-nm
  
  ASSEM_SRC = ppc-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.ppc-netbsd b/src/runtime/Config.ppc-netbsd
-index 07f668e..a17ebc7 100644
---- a/src/runtime/Config.ppc-netbsd
-+++ b/src/runtime/Config.ppc-netbsd
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.ppc-netbsd sbcl-1.0.49/src/runtime/Config.ppc-netbsd
+--- sbcl-1.0.49.orig/src/runtime/Config.ppc-netbsd	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.ppc-netbsd	2011-06-08 17:50:43.412210569 +0200
 @@ -9,8 +9,8 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -168,10 +157,9 @@ index 07f668e..a17ebc7 100644
  
  ASSEM_SRC = ppc-assem.S ldso-stubs.S
  ARCH_SRC = ppc-arch.c
-diff --git a/src/runtime/Config.sparc-linux b/src/runtime/Config.sparc-linux
-index 1ad0213..96af999 100644
---- a/src/runtime/Config.sparc-linux
-+++ b/src/runtime/Config.sparc-linux
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.sparc-linux sbcl-1.0.49/src/runtime/Config.sparc-linux
+--- sbcl-1.0.49.orig/src/runtime/Config.sparc-linux	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.sparc-linux	2011-06-08 17:50:43.412210569 +0200
 @@ -9,8 +9,7 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -182,10 +170,9 @@ index 1ad0213..96af999 100644
  NM = ./linux-nm
  
  ASSEM_SRC = sparc-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.sparc-netbsd b/src/runtime/Config.sparc-netbsd
-index ec95cf8..7ca8cab 100644
---- a/src/runtime/Config.sparc-netbsd
-+++ b/src/runtime/Config.sparc-netbsd
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.sparc-netbsd sbcl-1.0.49/src/runtime/Config.sparc-netbsd
+--- sbcl-1.0.49.orig/src/runtime/Config.sparc-netbsd	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.sparc-netbsd	2011-06-08 17:50:43.412210569 +0200
 @@ -10,8 +10,8 @@
  # files for more information.
  
@@ -197,10 +184,9 @@ index ec95cf8..7ca8cab 100644
  NM = nm -t x -p
  
  ASSEM_SRC = sparc-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.sparc-sunos b/src/runtime/Config.sparc-sunos
-index c5c89b8..7ca56e8 100644
---- a/src/runtime/Config.sparc-sunos
-+++ b/src/runtime/Config.sparc-sunos
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.sparc-sunos sbcl-1.0.49/src/runtime/Config.sparc-sunos
+--- sbcl-1.0.49.orig/src/runtime/Config.sparc-sunos	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.sparc-sunos	2011-06-08 17:50:43.415543887 +0200
 @@ -11,8 +11,8 @@
  
  CC = gcc
@@ -212,10 +198,9 @@ index c5c89b8..7ca56e8 100644
  NM = nm -t x -p 
  
  ASSEM_SRC = sparc-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.x86-64-darwin b/src/runtime/Config.x86-64-darwin
-index 24965f5..efecb06 100644
---- a/src/runtime/Config.x86-64-darwin
-+++ b/src/runtime/Config.x86-64-darwin
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-darwin sbcl-1.0.49/src/runtime/Config.x86-64-darwin
+--- sbcl-1.0.49.orig/src/runtime/Config.x86-64-darwin	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.x86-64-darwin	2011-06-08 17:50:43.415543887 +0200
 @@ -9,13 +9,15 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -235,7 +220,7 @@ index 24965f5..efecb06 100644
  endif
  ifdef LISP_FEATURE_INODE64
  CFLAGS += -D_DARWIN_USE_64_BIT_INODE
-@@ -31,9 +33,9 @@ endif
+@@ -31,9 +33,9 @@
  ASSEM_SRC = x86-64-assem.S ldso-stubs.S
  ARCH_SRC = x86-64-arch.c
  
@@ -247,11 +232,10 @@ index 24965f5..efecb06 100644
  
  GC_SRC = gencgc.c
  
-diff --git a/src/runtime/Config.x86-64-freebsd b/src/runtime/Config.x86-64-freebsd
-index cb35476..2945aa5 100644
---- a/src/runtime/Config.x86-64-freebsd
-+++ b/src/runtime/Config.x86-64-freebsd
-@@ -13,11 +13,11 @@ include Config.x86-64-bsd
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-freebsd sbcl-1.0.49/src/runtime/Config.x86-64-freebsd
+--- sbcl-1.0.49.orig/src/runtime/Config.x86-64-freebsd	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.x86-64-freebsd	2011-06-08 17:50:43.415543887 +0200
+@@ -13,11 +13,11 @@
  
  ASSEM_SRC += ldso-stubs.S
  
@@ -265,11 +249,22 @@ index cb35476..2945aa5 100644
  
  # use libthr (1:1 threading).  libpthread (m:n threading) does not work.
  ifdef LISP_FEATURE_SB_THREAD
-diff --git a/src/runtime/Config.x86-64-netbsd b/src/runtime/Config.x86-64-netbsd
-index e893ee0..41e66ba 100644
---- a/src/runtime/Config.x86-64-netbsd
-+++ b/src/runtime/Config.x86-64-netbsd
-@@ -14,9 +14,4 @@ include Config.x86-64-bsd
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86_64-linux sbcl-1.0.49/src/runtime/Config.x86_64-linux
+--- sbcl-1.0.49.orig/src/runtime/Config.x86_64-linux	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.x86_64-linux	2011-06-08 17:50:43.425543844 +0200
+@@ -27,7 +27,7 @@
+ # (You *are* encouraged to design and implement a coherent stable
+ # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
+ # working on one and it would be a nice thing to have.)
+-LINKFLAGS += -Wl,--export-dynamic
++LDFLAGS += -Wl,--export-dynamic
+ OS_LIBS = -ldl
+ 
+ ifdef LISP_FEATURE_LARGEFILE
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-netbsd sbcl-1.0.49/src/runtime/Config.x86-64-netbsd
+--- sbcl-1.0.49.orig/src/runtime/Config.x86-64-netbsd	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.x86-64-netbsd	2011-06-08 17:50:43.415543887 +0200
+@@ -14,9 +14,4 @@
  ASSEM_SRC += ldso-stubs.S
  OS_LIBS += -lutil
  
@@ -279,11 +274,10 @@ index e893ee0..41e66ba 100644
 -
 -LINKFLAGS += -export-dynamic
  LDFLAGS += -export-dynamic
-diff --git a/src/runtime/Config.x86-64-openbsd b/src/runtime/Config.x86-64-openbsd
-index e893ee0..41e66ba 100644
---- a/src/runtime/Config.x86-64-openbsd
-+++ b/src/runtime/Config.x86-64-openbsd
-@@ -14,9 +14,4 @@ include Config.x86-64-bsd
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-openbsd sbcl-1.0.49/src/runtime/Config.x86-64-openbsd
+--- sbcl-1.0.49.orig/src/runtime/Config.x86-64-openbsd	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.x86-64-openbsd	2011-06-08 17:50:43.418877206 +0200
+@@ -14,9 +14,4 @@
  ASSEM_SRC += ldso-stubs.S
  OS_LIBS += -lutil
  
@@ -293,10 +287,9 @@ index e893ee0..41e66ba 100644
 -
 -LINKFLAGS += -export-dynamic
  LDFLAGS += -export-dynamic
-diff --git a/src/runtime/Config.x86-64-sunos b/src/runtime/Config.x86-64-sunos
-index 8441cef..208a4f7 100644
---- a/src/runtime/Config.x86-64-sunos
-+++ b/src/runtime/Config.x86-64-sunos
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-sunos sbcl-1.0.49/src/runtime/Config.x86-64-sunos
+--- sbcl-1.0.49.orig/src/runtime/Config.x86-64-sunos	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.x86-64-sunos	2011-06-08 17:50:43.418877206 +0200
 @@ -1,14 +1,14 @@
  CC=gcc
 -CFLAGS = -m64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
@@ -317,10 +310,9 @@ index 8441cef..208a4f7 100644
  
  ASSEM_SRC = x86-64-assem.S ldso-stubs.S
  ARCH_SRC = x86-64-arch.c
-diff --git a/src/runtime/Config.x86-darwin b/src/runtime/Config.x86-darwin
-index c1a3eb7..578f91a 100644
---- a/src/runtime/Config.x86-darwin
-+++ b/src/runtime/Config.x86-darwin
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-darwin sbcl-1.0.49/src/runtime/Config.x86-darwin
+--- sbcl-1.0.49.orig/src/runtime/Config.x86-darwin	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.x86-darwin	2011-06-08 17:50:43.418877206 +0200
 @@ -9,14 +9,15 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -341,11 +333,10 @@ index c1a3eb7..578f91a 100644
  endif
  
  OS_SRC = bsd-os.c x86-bsd-os.c darwin-os.c x86-darwin-os.c
-diff --git a/src/runtime/Config.x86-freebsd b/src/runtime/Config.x86-freebsd
-index a7533b6..2b4b8bd 100644
---- a/src/runtime/Config.x86-freebsd
-+++ b/src/runtime/Config.x86-freebsd
-@@ -13,11 +13,11 @@ include Config.x86-bsd
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-freebsd sbcl-1.0.49/src/runtime/Config.x86-freebsd
+--- sbcl-1.0.49.orig/src/runtime/Config.x86-freebsd	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.x86-freebsd	2011-06-08 17:50:43.418877206 +0200
+@@ -13,11 +13,11 @@
  
  ASSEM_SRC += ldso-stubs.S
  
@@ -359,11 +350,10 @@ index a7533b6..2b4b8bd 100644
  
  # use libthr (1:1 threading).  libpthread (m:n threading) does not work.
  ifdef LISP_FEATURE_SB_THREAD
-diff --git a/src/runtime/Config.x86-linux b/src/runtime/Config.x86-linux
-index d64a779..5c3bfe7 100644
---- a/src/runtime/Config.x86-linux
-+++ b/src/runtime/Config.x86-linux
-@@ -27,11 +27,11 @@ OS_SRC = linux-os.c x86-linux-os.c
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-linux sbcl-1.0.49/src/runtime/Config.x86-linux
+--- sbcl-1.0.49.orig/src/runtime/Config.x86-linux	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.x86-linux	2011-06-08 17:50:43.422210525 +0200
+@@ -27,11 +27,11 @@
  # (You *are* encouraged to design and implement a coherent stable
  # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
  # working on one and it would be a nice thing to have.)
@@ -377,11 +367,10 @@ index d64a779..5c3bfe7 100644
  endif
  
  ifdef LISP_FEATURE_SB_THREAD
-diff --git a/src/runtime/Config.x86-netbsd b/src/runtime/Config.x86-netbsd
-index cd3782c..b0cd748 100644
---- a/src/runtime/Config.x86-netbsd
-+++ b/src/runtime/Config.x86-netbsd
-@@ -13,6 +13,6 @@ include Config.x86-bsd
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-netbsd sbcl-1.0.49/src/runtime/Config.x86-netbsd
+--- sbcl-1.0.49.orig/src/runtime/Config.x86-netbsd	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.x86-netbsd	2011-06-08 17:50:43.422210525 +0200
+@@ -13,6 +13,6 @@
  
  ASSEM_SRC += ldso-stubs.S
  OS_SRC += undefineds.c
@@ -390,11 +379,10 @@ index cd3782c..b0cd748 100644
  
 -CFLAGS =  -g -Wall -O2
 +CFLAGS += -O2
-diff --git a/src/runtime/Config.x86-openbsd b/src/runtime/Config.x86-openbsd
-index b55c794..b98d701 100644
---- a/src/runtime/Config.x86-openbsd
-+++ b/src/runtime/Config.x86-openbsd
-@@ -18,11 +18,6 @@ OS_LIBS += -lutil
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-openbsd sbcl-1.0.49/src/runtime/Config.x86-openbsd
+--- sbcl-1.0.49.orig/src/runtime/Config.x86-openbsd	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.x86-openbsd	2011-06-08 17:50:43.422210525 +0200
+@@ -18,11 +18,6 @@
  # locations used. If you wish to link the runtime using -Z option then
  # please see the comments in src/compiler/x86/parms.lisp
  
@@ -407,10 +395,9 @@ index b55c794..b98d701 100644
  
 -CFLAGS =  -g -Wall -O2
 +CFLAGS += -O2
-diff --git a/src/runtime/Config.x86-sunos b/src/runtime/Config.x86-sunos
-index 2e58b51..fbb41aa 100644
---- a/src/runtime/Config.x86-sunos
-+++ b/src/runtime/Config.x86-sunos
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-sunos sbcl-1.0.49/src/runtime/Config.x86-sunos
+--- sbcl-1.0.49.orig/src/runtime/Config.x86-sunos	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.x86-sunos	2011-06-08 17:50:43.422210525 +0200
 @@ -1,6 +1,5 @@
  CC=gcc
 -CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT
@@ -419,45 +406,31 @@ index 2e58b51..fbb41aa 100644
  LD = ld
  NM = nm -xgp
  GREP = ggrep
-diff --git a/src/runtime/Config.x86-win32 b/src/runtime/Config.x86-win32
-index b341808..8d24df6 100644
---- a/src/runtime/Config.x86-win32
-+++ b/src/runtime/Config.x86-win32
-@@ -25,13 +25,13 @@ OS_SRC = win32-os.c x86-win32-os.c os-common.c
+diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-win32 sbcl-1.0.49/src/runtime/Config.x86-win32
+--- sbcl-1.0.49.orig/src/runtime/Config.x86-win32	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/Config.x86-win32	2011-06-08 18:02:18.182444901 +0200
+@@ -25,13 +25,13 @@
  # (You *are* encouraged to design and implement a coherent stable
  # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
  # working on one and it would be a nice thing to have.)
--OS_LINK_FLAGS = -Wl,--export-dynamic,-mno-cygwin
-+OS_LINK_FLAGS += -Wl,--export-dynamic,-mno-cygwin
- OS_LIBS = -mno-cygwin
+-OS_LINK_FLAGS = -Wl,--export-dynamic
+-OS_LIBS =
++OS_LINK_FLAGS += -Wl,--export-dynamic
++OS_LIBS +=
  
  GC_SRC = gencgc.c
  
--CFLAGS =  -g -Wall -O3 -mno-cygwin
+-CFLAGS =  -g -Wall -O3
 -ASFLAGS = $(CFLAGS)
-+CFLAGS += -O3 -mno-cygwin
++CFLAGS +=  -g -Wall -O3
 +ASFLAGS += $(CFLAGS)
  
  CPP = cpp
- CC = gcc-3
-diff --git a/src/runtime/Config.x86_64-linux b/src/runtime/Config.x86_64-linux
-index e1efb79..b17bfd4 100644
---- a/src/runtime/Config.x86_64-linux
-+++ b/src/runtime/Config.x86_64-linux
-@@ -27,7 +27,7 @@ OS_SRC = linux-os.c x86-64-linux-os.c
- # (You *are* encouraged to design and implement a coherent stable
- # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
- # working on one and it would be a nice thing to have.)
--LINKFLAGS += -Wl,--export-dynamic
-+LDFLAGS += -Wl,--export-dynamic
- OS_LIBS = -ldl
- 
- ifdef LISP_FEATURE_LARGEFILE
-diff --git a/src/runtime/GNUmakefile b/src/runtime/GNUmakefile
-index f0fbe19..6dc0581 100644
---- a/src/runtime/GNUmakefile
-+++ b/src/runtime/GNUmakefile
-@@ -18,27 +18,19 @@ TARGET=sbcl
+ CC = gcc
+diff -Naur sbcl-1.0.49.orig/src/runtime/GNUmakefile sbcl-1.0.49/src/runtime/GNUmakefile
+--- sbcl-1.0.49.orig/src/runtime/GNUmakefile	2011-06-05 21:35:34.000000000 +0200
++++ sbcl-1.0.49/src/runtime/GNUmakefile	2011-06-08 17:50:43.425543844 +0200
+@@ -18,27 +18,19 @@
  # Config file. Most of them are same on most systems right now.
  # If you need to override one of these, do it in Config.
  LD = ld
@@ -472,10 +445,7 @@ index f0fbe19..6dc0581 100644
 -CFLAGS = -g -Wall -Wsign-compare -O3
 -ASFLAGS = $(CFLAGS)
 -CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
-+SBCL_CFLAGS = -g -Wall -Wsign-compare -O3
-+SBCL_ASFLAGS = $(SBCL_CFLAGS)
-+SBCL_CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
- 
+-
 -# Give make access to the target Lisp features.
 -include genesis/Makefile.features
 -
@@ -486,12 +456,16 @@ index f0fbe19..6dc0581 100644
 -# Commonly used variables in Config are: ARCH_SRC, ASSEM_SRC, GC_SRC,
 -# OS_SRC, OS_LIBS, OS_OBJS, OS_CLEAN_FILES
 -include Config
++SBCL_CFLAGS = -g -Wall -Wsign-compare -O3
++SBCL_ASFLAGS = $(SBCL_CFLAGS)
++SBCL_CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
++
 +# Also included by tools-for-build/Makefile
 +-include platform.mk
  
  COMMON_SRC = alloc.c backtrace.c breakpoint.c coreparse.c \
  	dynbind.c funcall.c gc-common.c globals.c interr.c interrupt.c \
-@@ -58,7 +50,7 @@ LIBS = ${OS_LIBS} -lm
+@@ -58,7 +50,7 @@
  targets: $(TARGET) sbcl.nm
  
  $(TARGET): $(OBJS)
@@ -500,11 +474,9 @@ index f0fbe19..6dc0581 100644
  
  sbcl.nm: $(TARGET)
  	$(NM) $(TARGET) | $(GREP) -v " [FUw] " > ,$@
-diff --git a/src/runtime/platform.mk b/src/runtime/platform.mk
-new file mode 100644
-index 0000000..d2470cd
---- /dev/null
-+++ b/src/runtime/platform.mk
+diff -Naur sbcl-1.0.49.orig/src/runtime/platform.mk sbcl-1.0.49/src/runtime/platform.mk
+--- sbcl-1.0.49.orig/src/runtime/platform.mk	1970-01-01 01:00:00.000000000 +0100
++++ sbcl-1.0.49/src/runtime/platform.mk	2011-06-08 17:50:43.428877162 +0200
 @@ -0,0 +1,17 @@
 +# -*- makefile -*- for the C-level run-time support for SBCL
 +
@@ -523,10 +495,9 @@ index 0000000..d2470cd
 +CFLAGS   := $(SBCL_CFLAGS)   $(CFLAGS)
 +ASFLAGS  := $(SBCL_ASFLAGS)  $(ASFLAGS)
 +LDFLAGS  := $(SBCL_LDFLAGS)  $(LDFLAGS)
-diff --git a/tools-for-build/Makefile b/tools-for-build/Makefile
-index 7a4c16f..dc99ebc 100644
---- a/tools-for-build/Makefile
-+++ b/tools-for-build/Makefile
+diff -Naur sbcl-1.0.49.orig/tools-for-build/Makefile sbcl-1.0.49/tools-for-build/Makefile
+--- sbcl-1.0.49.orig/tools-for-build/Makefile	2011-06-05 21:35:35.000000000 +0200
++++ sbcl-1.0.49/tools-for-build/Makefile	2011-06-08 17:50:43.428877162 +0200
 @@ -7,12 +7,11 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.

diff --git a/dev-lisp/sbcl/sbcl-1.0.47.ebuild b/dev-lisp/sbcl/sbcl-1.0.47.ebuild
deleted file mode 100644
index f4f6f69..0000000
--- a/dev-lisp/sbcl/sbcl-1.0.47.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-inherit multilib eutils flag-o-matic
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.0.37
-BV_AMD64=1.0.37
-BV_PPC=1.0.28
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_MIPS=1.0.23
-BV_MIPSEL=1.0.28
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
-	mips? ( !cobalt? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.bz2 ) )
-	mips? ( cobalt? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPSEL}-mipsel-linux-binary.tar.bz2 ) )"
-RESTRICT="mirror"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ldb source +threads +unicode debug doc cobalt"
-
-DEPEND="doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
-RDEPEND="elibc_glibc? ( >=sys-libs/glibc-2.3 || ( <sys-libs/glibc-2.6[nptl] >=sys-libs/glibc-2.6 ) )"
-PDEPEND="dev-lisp/gentoo-init"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	cat > "${CONFIG}" <<'EOF'
-(lambda (list)
-  (flet ((enable  (x) (pushnew x list))
-		 (disable (x) (setf list (remove x list))))
-EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "$(usep ldb)" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	cat >> "${CONFIG}" <<'EOF'
-	)
-  list)
-EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv sbcl-*-linux sbcl-binary
-	cd "${S}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gentoo-fix_build_system.patch
-	epatch "${FILESDIR}"/gentoo-fix_install_man.patch
-	epatch "${FILESDIR}"/gentoo-fix_linux-os-c.patch
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh
-	sed "s,/lib,/$(get_libdir),g" -i install.sh
-	sed "s,/usr/local/lib,/usr/$(get_libdir),g" -i src/runtime/runtime.c # #define SBCL_HOME ...
-
-	find . -type f -name .cvsignore -delete
-}
-
-src_configure() {
-	# customizing SBCL version as per
-	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
-	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-
-	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
-
-	# To make the hardened compiler NOT compile with -fPIE -pie
-	if gcc-specs-pie ; then
-		filter-flags -fPIE
-		append-ldflags -nopie
-	fi
-
-	# clear the environment to get rid of non-ASCII strings, see bug 174702
-	# set HOME for paludis
-	env - HOME="${T}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		GNUMAKE=make ./make.sh \
-		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	cat > "${D}"/etc/sbclrc <<EOF
-;;; The following is required if you want source location functions to
-;;; work in SLIME, for example.
-
-(setf (logical-pathname-translations "SYS")
-	'(("SYS:SRC;**;*.*.*" #p"/usr/$(get_libdir)/sbcl/src/**/*.*")
-	  ("SYS:CONTRIB;**;*.*.*" #p"/usr/$(get_libdir)/sbcl/**/*.*")))
-
-;;; Setup ASDF
-(load "/etc/gentoo-init.lisp")
-EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${D}/usr" LIB_DIR="/usr/$(get_libdir)" DOC_DIR="${D}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# rm empty directories lest paludis complain about this
-	find "${D}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dohtml -r doc/manual/
-		doinfo doc/manual/*.info*
-		dohtml -r doc/internals/sbcl-internals
-		doinfo doc/internals/sbcl-internals.info
-		docinto internals-notes && dodoc doc/internals-notes/*
-	else
-		rm -Rv "${D}/usr/share/doc/${PF}"
-	fi
-
-	dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE TLA TODO
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${D}/usr/$(get_libdir)/sbcl/"
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}

diff --git a/dev-lisp/sbcl/sbcl-1.0.45-r1.ebuild b/dev-lisp/sbcl/sbcl-1.0.49.ebuild
similarity index 100%
rename from dev-lisp/sbcl/sbcl-1.0.45-r1.ebuild
rename to dev-lisp/sbcl/sbcl-1.0.49.ebuild



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
@ 2011-07-14 16:37 Stelian Ionescu
  0 siblings, 0 replies; 13+ messages in thread
From: Stelian Ionescu @ 2011-07-14 16:37 UTC (permalink / raw
  To: gentoo-commits

commit:     6002c09eebd60ee1663a03215ee21353f8ccc547
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Thu Jul 14 16:36:31 2011 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Thu Jul 14 16:36:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=6002c09e

dev-lisp/sbcl: bump to 1.0.50

---
 ....patch => 1.0.50-gentoo-fix_build_system.patch} |    0
 .../{sbcl-1.0.49-r2.ebuild => sbcl-1.0.50.ebuild}  |    0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-lisp/sbcl/files/1.0.49-gentoo-fix_build_system.patch b/dev-lisp/sbcl/files/1.0.50-gentoo-fix_build_system.patch
similarity index 100%
rename from dev-lisp/sbcl/files/1.0.49-gentoo-fix_build_system.patch
rename to dev-lisp/sbcl/files/1.0.50-gentoo-fix_build_system.patch

diff --git a/dev-lisp/sbcl/sbcl-1.0.49-r2.ebuild b/dev-lisp/sbcl/sbcl-1.0.50.ebuild
similarity index 100%
rename from dev-lisp/sbcl/sbcl-1.0.49-r2.ebuild
rename to dev-lisp/sbcl/sbcl-1.0.50.ebuild



^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
@ 2011-08-08  0:03 Stelian Ionescu
  0 siblings, 0 replies; 13+ messages in thread
From: Stelian Ionescu @ 2011-08-08  0:03 UTC (permalink / raw
  To: gentoo-commits

commit:     23b8fdc6be41c45210cf1469c8638fdbea0fda5b
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Mon Aug  8 00:02:35 2011 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Mon Aug  8 00:02:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=23b8fdc6

dev-lisp/sbcl-1.0.50: backport patch for parsing newer linux kernel versions

---
 .../1.0.50-fix-linux-kernel-version-parsing.patch  |   38 ++++++++++++++++++++
 .../{sbcl-1.0.50.ebuild => sbcl-1.0.50-r1.ebuild}  |    1 +
 2 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/dev-lisp/sbcl/files/1.0.50-fix-linux-kernel-version-parsing.patch b/dev-lisp/sbcl/files/1.0.50-fix-linux-kernel-version-parsing.patch
new file mode 100644
index 0000000..cf3746a
--- /dev/null
+++ b/dev-lisp/sbcl/files/1.0.50-fix-linux-kernel-version-parsing.patch
@@ -0,0 +1,38 @@
+commit b43c51beeb0569a38900e1e5a78606711f987742
+Author: Paul Khuong <pvk@pvk.ca>
+Date:   Wed Aug 3 10:20:41 2011 -0400
+
+    Fix version string parsing for Linux 3.0
+    
+     Stop assuming the presence of minor and patch version numbers; missing
+     values are defaulted to 0 (e.g. 3.0.0).
+    
+     Reported by a few people on IRC.
+
+diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
+index db72fa6..e262f41 100644
+--- a/src/runtime/linux-os.c
++++ b/src/runtime/linux-os.c
+@@ -198,12 +198,18 @@ os_init(char *argv[], char *envp[])
+     int patch_version;
+     char *p;
+     uname(&name);
++
+     p=name.release;
+     major_version = atoi(p);
+-    p=strchr(p,'.')+1;
+-    minor_version = atoi(p);
+-    p=strchr(p,'.')+1;
+-    patch_version = atoi(p);
++    minor_version = patch_version = 0;
++    p=strchr(p,'.');
++    if (p != NULL) {
++            minor_version = atoi(++p);
++            p=strchr(p,'.');
++            if (p != NULL)
++                    patch_version = atoi(++p);
++    }
++
+     if (major_version<2) {
+         lose("linux kernel version too old: major version=%d (can't run in version < 2.0.0)\n",
+              major_version);

diff --git a/dev-lisp/sbcl/sbcl-1.0.50.ebuild b/dev-lisp/sbcl/sbcl-1.0.50-r1.ebuild
similarity index 98%
rename from dev-lisp/sbcl/sbcl-1.0.50.ebuild
rename to dev-lisp/sbcl/sbcl-1.0.50-r1.ebuild
index 4c47165..ccc2eda 100644
--- a/dev-lisp/sbcl/sbcl-1.0.50.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.0.50-r1.ebuild
@@ -77,6 +77,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-gentoo-fix_build_system.patch
+	epatch "${FILESDIR}"/${PV}-fix-linux-kernel-version-parsing.patch
 	epatch "${FILESDIR}"/gentoo-fix_install_man.patch
 	epatch "${FILESDIR}"/gentoo-fix_linux-os-c.patch
 



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
@ 2011-08-26 23:20 Stelian Ionescu
  0 siblings, 0 replies; 13+ messages in thread
From: Stelian Ionescu @ 2011-08-26 23:20 UTC (permalink / raw
  To: gentoo-commits

commit:     b4f30c95c4e8af9b3be3a151ef7f2c3564011d20
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Fri Aug 26 23:20:21 2011 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Fri Aug 26 23:20:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=b4f30c95

dev-lisp/sbcl: fix build system

---
 .../1.0.50-fix-linux-kernel-version-parsing.patch  |   38 --
 ....patch => 1.0.51-gentoo-fix_build_system.patch} |  359 +++++++++++---------
 dev-lisp/sbcl/sbcl-1.0.51.ebuild                   |    1 -
 3 files changed, 203 insertions(+), 195 deletions(-)

diff --git a/dev-lisp/sbcl/files/1.0.50-fix-linux-kernel-version-parsing.patch b/dev-lisp/sbcl/files/1.0.50-fix-linux-kernel-version-parsing.patch
deleted file mode 100644
index cf3746a..0000000
--- a/dev-lisp/sbcl/files/1.0.50-fix-linux-kernel-version-parsing.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit b43c51beeb0569a38900e1e5a78606711f987742
-Author: Paul Khuong <pvk@pvk.ca>
-Date:   Wed Aug 3 10:20:41 2011 -0400
-
-    Fix version string parsing for Linux 3.0
-    
-     Stop assuming the presence of minor and patch version numbers; missing
-     values are defaulted to 0 (e.g. 3.0.0).
-    
-     Reported by a few people on IRC.
-
-diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
-index db72fa6..e262f41 100644
---- a/src/runtime/linux-os.c
-+++ b/src/runtime/linux-os.c
-@@ -198,12 +198,18 @@ os_init(char *argv[], char *envp[])
-     int patch_version;
-     char *p;
-     uname(&name);
-+
-     p=name.release;
-     major_version = atoi(p);
--    p=strchr(p,'.')+1;
--    minor_version = atoi(p);
--    p=strchr(p,'.')+1;
--    patch_version = atoi(p);
-+    minor_version = patch_version = 0;
-+    p=strchr(p,'.');
-+    if (p != NULL) {
-+            minor_version = atoi(++p);
-+            p=strchr(p,'.');
-+            if (p != NULL)
-+                    patch_version = atoi(++p);
-+    }
-+
-     if (major_version<2) {
-         lose("linux kernel version too old: major version=%d (can't run in version < 2.0.0)\n",
-              major_version);

diff --git a/dev-lisp/sbcl/files/1.0.50-gentoo-fix_build_system.patch b/dev-lisp/sbcl/files/1.0.51-gentoo-fix_build_system.patch
similarity index 55%
rename from dev-lisp/sbcl/files/1.0.50-gentoo-fix_build_system.patch
rename to dev-lisp/sbcl/files/1.0.51-gentoo-fix_build_system.patch
index fbfcff2..f3dbbc7 100644
--- a/dev-lisp/sbcl/files/1.0.50-gentoo-fix_build_system.patch
+++ b/dev-lisp/sbcl/files/1.0.51-gentoo-fix_build_system.patch
@@ -1,13 +1,14 @@
-diff -Naur sbcl-1.0.49.orig/contrib/asdf-module.mk sbcl-1.0.49/contrib/asdf-module.mk
---- sbcl-1.0.49.orig/contrib/asdf-module.mk	2011-06-05 21:35:33.000000000 +0200
-+++ sbcl-1.0.49/contrib/asdf-module.mk	2011-06-08 17:50:43.402210614 +0200
+diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
+index d3ffbad..7a5936e 100644
+--- a/contrib/asdf-module.mk
++++ b/contrib/asdf-module.mk
 @@ -1,3 +1,5 @@
 +# -*- makefile -*- included by contribs built with ASDF
 +
  CC=gcc
  
  # We need to extend flags to the C compiler and the linker
-@@ -7,6 +9,9 @@
+@@ -7,6 +9,9 @@ CC=gcc
  # directly via ASDF from a non-C-aware module which has these tricky
  # ones as dependencies.
  
@@ -17,7 +18,7 @@ diff -Naur sbcl-1.0.49.orig/contrib/asdf-module.mk sbcl-1.0.49/contrib/asdf-modu
  UNAME:=$(shell uname -s)
  
  ifeq (SunOS,$(UNAME))
-@@ -23,7 +28,9 @@
+@@ -23,7 +28,9 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
    CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC))))
  endif
  
@@ -28,9 +29,10 @@ diff -Naur sbcl-1.0.49.orig/contrib/asdf-module.mk sbcl-1.0.49/contrib/asdf-modu
  
  all: $(EXTRA_ALL_TARGETS)
  	$(MAKE) -C ../asdf
-diff -Naur sbcl-1.0.49.orig/contrib/vanilla-module.mk sbcl-1.0.49/contrib/vanilla-module.mk
---- sbcl-1.0.49.orig/contrib/vanilla-module.mk	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/contrib/vanilla-module.mk	2011-06-08 17:50:43.405543933 +0200
+diff --git a/contrib/vanilla-module.mk b/contrib/vanilla-module.mk
+index 41c1771..4c343ee 100644
+--- a/contrib/vanilla-module.mk
++++ b/contrib/vanilla-module.mk
 @@ -1,3 +1,7 @@
 +# -*- makefile -*- included by contribs that don't use ASDF
 +
@@ -39,10 +41,11 @@ diff -Naur sbcl-1.0.49.orig/contrib/vanilla-module.mk sbcl-1.0.49/contrib/vanill
  
  $(MODULE).fasl: $(MODULE).lisp ../../output/sbcl.core
  	$(SBCL) --eval '(compile-file (format nil "SYS:CONTRIB;~:@(~A~);~:@(~A~).LISP" "$(MODULE)" "$(MODULE)"))' </dev/null
-diff -Naur sbcl-1.0.49.orig/make-target-contrib.sh sbcl-1.0.49/make-target-contrib.sh
---- sbcl-1.0.49.orig/make-target-contrib.sh	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/make-target-contrib.sh	2011-06-08 17:50:43.405543933 +0200
-@@ -66,7 +66,7 @@
+diff --git a/make-target-contrib.sh b/make-target-contrib.sh
+index 85345e6..e3185d8 100644
+--- a/make-target-contrib.sh
++++ b/make-target-contrib.sh
+@@ -66,7 +66,7 @@ for i in contrib/*; do
      # export INSTALL_DIR=$SBCL_HOME/`basename $i `
      test -f $i/test-passed && rm $i/test-passed
      # hack to get exit codes right.
@@ -51,21 +54,23 @@ diff -Naur sbcl-1.0.49.orig/make-target-contrib.sh sbcl-1.0.49/make-target-contr
  	:
      else
  	exit $?
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.alpha-linux sbcl-1.0.49/src/runtime/Config.alpha-linux
---- sbcl-1.0.49.orig/src/runtime/Config.alpha-linux	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.alpha-linux	2011-06-08 17:50:43.405543933 +0200
+diff --git a/src/runtime/Config.alpha-linux b/src/runtime/Config.alpha-linux
+index 42df1fc..50de020 100644
+--- a/src/runtime/Config.alpha-linux
++++ b/src/runtime/Config.alpha-linux
 @@ -10,7 +10,7 @@
  # files for more information.
  
  LD = ld -taso
 -LINKFLAGS += -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynamic
-+LDFLAGS += -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynamic
++SBCL_LDFLAGS += -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynamic
  NM = ./linux-nm
  
  ASSEM_SRC = alpha-assem.S ldso-stubs.S
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.alpha-osf1 sbcl-1.0.49/src/runtime/Config.alpha-osf1
---- sbcl-1.0.49.orig/src/runtime/Config.alpha-osf1	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.alpha-osf1	2011-06-08 17:50:43.405543933 +0200
+diff --git a/src/runtime/Config.alpha-osf1 b/src/runtime/Config.alpha-osf1
+index 0553f48..8c39543 100644
+--- a/src/runtime/Config.alpha-osf1
++++ b/src/runtime/Config.alpha-osf1
 @@ -9,11 +9,10 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -80,9 +85,10 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/Config.alpha-osf1 sbcl-1.0.49/src/runtim
  # Digital^WCompaq^WHP's cc declares `static inline' functions to exist
  # in multiple places in the binary; we add the '-g' flag to suppress all
  # internal (i.e. static) function names being spat out.  GENESIS
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.hppa-hpux sbcl-1.0.49/src/runtime/Config.hppa-hpux
---- sbcl-1.0.49.orig/src/runtime/Config.hppa-hpux	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.hppa-hpux	2011-06-08 17:50:43.408877251 +0200
+diff --git a/src/runtime/Config.hppa-hpux b/src/runtime/Config.hppa-hpux
+index fec282b..7509a60 100644
+--- a/src/runtime/Config.hppa-hpux
++++ b/src/runtime/Config.hppa-hpux
 @@ -9,7 +9,7 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -92,33 +98,45 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/Config.hppa-hpux sbcl-1.0.49/src/runtime
  # avoid native tools
  NM = /usr/local/bin/nm
  CC = /usr/local/bin/gcc
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.hppa-linux sbcl-1.0.49/src/runtime/Config.hppa-linux
---- sbcl-1.0.49.orig/src/runtime/Config.hppa-linux	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.hppa-linux	2011-06-08 17:50:43.408877251 +0200
+diff --git a/src/runtime/Config.hppa-linux b/src/runtime/Config.hppa-linux
+index 72449bd..1145452 100644
+--- a/src/runtime/Config.hppa-linux
++++ b/src/runtime/Config.hppa-linux
 @@ -9,7 +9,7 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
  
 -LINKFLAGS += -v -static
-+LDFLAGS += -v -static
++SBCL_LDFLAGS += -v -static
  NM = ./linux-nm
  
  ASSEM_SRC = hppa-assem.S #hppa-linux-stubs.S
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.mips-linux sbcl-1.0.49/src/runtime/Config.mips-linux
---- sbcl-1.0.49.orig/src/runtime/Config.mips-linux	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.mips-linux	2011-06-08 17:50:43.408877251 +0200
+diff --git a/src/runtime/Config.mips-linux b/src/runtime/Config.mips-linux
+index 9f32f3c..88cc65c 100644
+--- a/src/runtime/Config.mips-linux
++++ b/src/runtime/Config.mips-linux
 @@ -9,7 +9,7 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
  
 -LINKFLAGS += -v -O2 -Wl,--export-dynamic
-+LDFLAGS += -v -O2 -Wl,--export-dynamic
++SBCL_LDFLAGS += -v -O2 -Wl,--export-dynamic
  NM = ./linux-nm
  
  ASSEM_SRC = mips-assem.S ldso-stubs.S
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.ppc-darwin sbcl-1.0.49/src/runtime/Config.ppc-darwin
---- sbcl-1.0.49.orig/src/runtime/Config.ppc-darwin	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.ppc-darwin	2011-06-08 17:50:43.408877251 +0200
+@@ -19,7 +19,7 @@ OS_SRC = linux-os.c mips-linux-os.c
+ OS_LIBS = -ldl
+ 
+ ifdef LISP_FEATURE_LARGEFILE
+-  CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++  SBCL_CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ endif
+ 
+ ifdef LISP_FEATURE_SB_THREAD
+diff --git a/src/runtime/Config.ppc-darwin b/src/runtime/Config.ppc-darwin
+index 0d3d79a..ea3eaf7 100644
+--- a/src/runtime/Config.ppc-darwin
++++ b/src/runtime/Config.ppc-darwin
 @@ -9,8 +9,8 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -130,22 +148,24 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/Config.ppc-darwin sbcl-1.0.49/src/runtim
  
  OS_SRC = bsd-os.c darwin-os.c ppc-darwin-os.c
  
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.ppc-linux sbcl-1.0.49/src/runtime/Config.ppc-linux
---- sbcl-1.0.49.orig/src/runtime/Config.ppc-linux	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.ppc-linux	2011-06-08 17:50:43.412210569 +0200
+diff --git a/src/runtime/Config.ppc-linux b/src/runtime/Config.ppc-linux
+index f8ceded..77fa228 100644
+--- a/src/runtime/Config.ppc-linux
++++ b/src/runtime/Config.ppc-linux
 @@ -9,8 +9,7 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
  
 -CFLAGS = -g
 -LINKFLAGS += -v -rdynamic
-+LDFLAGS += -v -rdynamic
++SBCL_LDFLAGS += -v -rdynamic
  NM = ./linux-nm
  
  ASSEM_SRC = ppc-assem.S ldso-stubs.S
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.ppc-netbsd sbcl-1.0.49/src/runtime/Config.ppc-netbsd
---- sbcl-1.0.49.orig/src/runtime/Config.ppc-netbsd	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.ppc-netbsd	2011-06-08 17:50:43.412210569 +0200
+diff --git a/src/runtime/Config.ppc-netbsd b/src/runtime/Config.ppc-netbsd
+index 07f668e..a17ebc7 100644
+--- a/src/runtime/Config.ppc-netbsd
++++ b/src/runtime/Config.ppc-netbsd
 @@ -9,8 +9,8 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -157,22 +177,24 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/Config.ppc-netbsd sbcl-1.0.49/src/runtim
  
  ASSEM_SRC = ppc-assem.S ldso-stubs.S
  ARCH_SRC = ppc-arch.c
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.sparc-linux sbcl-1.0.49/src/runtime/Config.sparc-linux
---- sbcl-1.0.49.orig/src/runtime/Config.sparc-linux	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.sparc-linux	2011-06-08 17:50:43.412210569 +0200
+diff --git a/src/runtime/Config.sparc-linux b/src/runtime/Config.sparc-linux
+index 1ad0213..4b4f389 100644
+--- a/src/runtime/Config.sparc-linux
++++ b/src/runtime/Config.sparc-linux
 @@ -9,8 +9,7 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
  
 -ASFLAGS = -g -Wall
 -LINKFLAGS += -v -rdynamic
-+LDFLAGS += -v -rdynamic
++SBCL_LDFLAGS += -v -rdynamic
  NM = ./linux-nm
  
  ASSEM_SRC = sparc-assem.S ldso-stubs.S
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.sparc-netbsd sbcl-1.0.49/src/runtime/Config.sparc-netbsd
---- sbcl-1.0.49.orig/src/runtime/Config.sparc-netbsd	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.sparc-netbsd	2011-06-08 17:50:43.412210569 +0200
+diff --git a/src/runtime/Config.sparc-netbsd b/src/runtime/Config.sparc-netbsd
+index ec95cf8..7ca8cab 100644
+--- a/src/runtime/Config.sparc-netbsd
++++ b/src/runtime/Config.sparc-netbsd
 @@ -10,8 +10,8 @@
  # files for more information.
  
@@ -184,9 +206,10 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/Config.sparc-netbsd sbcl-1.0.49/src/runt
  NM = nm -t x -p
  
  ASSEM_SRC = sparc-assem.S ldso-stubs.S
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.sparc-sunos sbcl-1.0.49/src/runtime/Config.sparc-sunos
---- sbcl-1.0.49.orig/src/runtime/Config.sparc-sunos	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.sparc-sunos	2011-06-08 17:50:43.415543887 +0200
+diff --git a/src/runtime/Config.sparc-sunos b/src/runtime/Config.sparc-sunos
+index c5c89b8..7ca56e8 100644
+--- a/src/runtime/Config.sparc-sunos
++++ b/src/runtime/Config.sparc-sunos
 @@ -11,8 +11,8 @@
  
  CC = gcc
@@ -198,9 +221,10 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/Config.sparc-sunos sbcl-1.0.49/src/runti
  NM = nm -t x -p 
  
  ASSEM_SRC = sparc-assem.S ldso-stubs.S
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-darwin sbcl-1.0.49/src/runtime/Config.x86-64-darwin
---- sbcl-1.0.49.orig/src/runtime/Config.x86-64-darwin	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.x86-64-darwin	2011-06-08 17:50:43.415543887 +0200
+diff --git a/src/runtime/Config.x86-64-darwin b/src/runtime/Config.x86-64-darwin
+index 24965f5..efecb06 100644
+--- a/src/runtime/Config.x86-64-darwin
++++ b/src/runtime/Config.x86-64-darwin
 @@ -9,13 +9,15 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
@@ -220,7 +244,7 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-darwin sbcl-1.0.49/src/run
  endif
  ifdef LISP_FEATURE_INODE64
  CFLAGS += -D_DARWIN_USE_64_BIT_INODE
-@@ -31,9 +33,9 @@
+@@ -31,9 +33,9 @@ endif
  ASSEM_SRC = x86-64-assem.S ldso-stubs.S
  ARCH_SRC = x86-64-arch.c
  
@@ -232,10 +256,11 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-darwin sbcl-1.0.49/src/run
  
  GC_SRC = gencgc.c
  
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-freebsd sbcl-1.0.49/src/runtime/Config.x86-64-freebsd
---- sbcl-1.0.49.orig/src/runtime/Config.x86-64-freebsd	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.x86-64-freebsd	2011-06-08 17:50:43.415543887 +0200
-@@ -13,11 +13,11 @@
+diff --git a/src/runtime/Config.x86-64-freebsd b/src/runtime/Config.x86-64-freebsd
+index cb35476..2945aa5 100644
+--- a/src/runtime/Config.x86-64-freebsd
++++ b/src/runtime/Config.x86-64-freebsd
+@@ -13,11 +13,11 @@ include Config.x86-64-bsd
  
  ASSEM_SRC += ldso-stubs.S
  
@@ -249,22 +274,11 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-freebsd sbcl-1.0.49/src/ru
  
  # use libthr (1:1 threading).  libpthread (m:n threading) does not work.
  ifdef LISP_FEATURE_SB_THREAD
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86_64-linux sbcl-1.0.49/src/runtime/Config.x86_64-linux
---- sbcl-1.0.49.orig/src/runtime/Config.x86_64-linux	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.x86_64-linux	2011-06-08 17:50:43.425543844 +0200
-@@ -27,7 +27,7 @@
- # (You *are* encouraged to design and implement a coherent stable
- # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
- # working on one and it would be a nice thing to have.)
--LINKFLAGS += -Wl,--export-dynamic
-+LDFLAGS += -Wl,--export-dynamic
- OS_LIBS = -ldl
- 
- ifdef LISP_FEATURE_LARGEFILE
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-netbsd sbcl-1.0.49/src/runtime/Config.x86-64-netbsd
---- sbcl-1.0.49.orig/src/runtime/Config.x86-64-netbsd	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.x86-64-netbsd	2011-06-08 17:50:43.415543887 +0200
-@@ -14,9 +14,4 @@
+diff --git a/src/runtime/Config.x86-64-netbsd b/src/runtime/Config.x86-64-netbsd
+index e893ee0..41e66ba 100644
+--- a/src/runtime/Config.x86-64-netbsd
++++ b/src/runtime/Config.x86-64-netbsd
+@@ -14,9 +14,4 @@ include Config.x86-64-bsd
  ASSEM_SRC += ldso-stubs.S
  OS_LIBS += -lutil
  
@@ -274,10 +288,11 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-netbsd sbcl-1.0.49/src/run
 -
 -LINKFLAGS += -export-dynamic
  LDFLAGS += -export-dynamic
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-openbsd sbcl-1.0.49/src/runtime/Config.x86-64-openbsd
---- sbcl-1.0.49.orig/src/runtime/Config.x86-64-openbsd	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.x86-64-openbsd	2011-06-08 17:50:43.418877206 +0200
-@@ -14,9 +14,4 @@
+diff --git a/src/runtime/Config.x86-64-openbsd b/src/runtime/Config.x86-64-openbsd
+index e893ee0..41e66ba 100644
+--- a/src/runtime/Config.x86-64-openbsd
++++ b/src/runtime/Config.x86-64-openbsd
+@@ -14,9 +14,4 @@ include Config.x86-64-bsd
  ASSEM_SRC += ldso-stubs.S
  OS_LIBS += -lutil
  
@@ -287,9 +302,10 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-openbsd sbcl-1.0.49/src/ru
 -
 -LINKFLAGS += -export-dynamic
  LDFLAGS += -export-dynamic
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-sunos sbcl-1.0.49/src/runtime/Config.x86-64-sunos
---- sbcl-1.0.49.orig/src/runtime/Config.x86-64-sunos	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.x86-64-sunos	2011-06-08 17:50:43.418877206 +0200
+diff --git a/src/runtime/Config.x86-64-sunos b/src/runtime/Config.x86-64-sunos
+index 8441cef..208a4f7 100644
+--- a/src/runtime/Config.x86-64-sunos
++++ b/src/runtime/Config.x86-64-sunos
 @@ -1,14 +1,14 @@
  CC=gcc
 -CFLAGS = -m64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
@@ -310,33 +326,45 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-64-sunos sbcl-1.0.49/src/runt
  
  ASSEM_SRC = x86-64-assem.S ldso-stubs.S
  ARCH_SRC = x86-64-arch.c
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-darwin sbcl-1.0.49/src/runtime/Config.x86-darwin
---- sbcl-1.0.49.orig/src/runtime/Config.x86-darwin	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.x86-darwin	2011-06-08 17:50:43.418877206 +0200
-@@ -9,14 +9,15 @@
+diff --git a/src/runtime/Config.x86-darwin b/src/runtime/Config.x86-darwin
+index df53b0c..4e6683d 100644
+--- a/src/runtime/Config.x86-darwin
++++ b/src/runtime/Config.x86-darwin
+@@ -9,14 +9,14 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
  
--CFLAGS = -arch i386 -g -Wall -O2 -fdollars-in-identifiers
+-CFLAGS = -arch i386 -g -Wall -O2 -fdollars-in-identifiers -fno-omit-frame-pointer
 -LINKFLAGS += -arch i386
-+CFLAGS += -arch i386 -g -Wall -O2 -fdollars-in-identifiers
-+LDFLAGS += -arch i386
-+
++SBCL_CFLAGS += -arch i386 -O2 -fdollars-in-identifiers -fno-omit-frame-pointer
++SBCL_LDFLAGS += -arch i386
  ifdef LISP_FEATURE_DARWIN9_OR_BETTER
- CFLAGS += -mmacosx-version-min=10.5
+-CFLAGS += -mmacosx-version-min=10.5
 -LINKFLAGS += -mmacosx-version-min=10.5
-+LDFLAGS += -mmacosx-version-min=10.5
++SBCL_CFLAGS += -mmacosx-version-min=10.5
++SBCL_LDFLAGS += -mmacosx-version-min=10.5
  else
- CFLAGS += -mmacosx-version-min=10.4
+-CFLAGS += -mmacosx-version-min=10.4
 -LINKFLAGS += -mmacosx-version-min=10.4
-+LDFLAGS += -mmacosx-version-min=10.4
++SBCL_CFLAGS += -mmacosx-version-min=10.4
++SBCL_LDFLAGS += -mmacosx-version-min=10.4
  endif
  
  OS_SRC = bsd-os.c x86-bsd-os.c darwin-os.c x86-darwin-os.c
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-freebsd sbcl-1.0.49/src/runtime/Config.x86-freebsd
---- sbcl-1.0.49.orig/src/runtime/Config.x86-freebsd	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.x86-freebsd	2011-06-08 17:50:43.418877206 +0200
-@@ -13,11 +13,11 @@
+@@ -31,7 +31,7 @@ CC = gcc
+ ASSEM_SRC = x86-assem.S ldso-stubs.S
+ ARCH_SRC = x86-arch.c
+ 
+-CPPFLAGS += -no-cpp-precomp
++SBCL_CPPFLAGS += -no-cpp-precomp
+ 
+ GC_SRC = gencgc.c
+ 
+diff --git a/src/runtime/Config.x86-freebsd b/src/runtime/Config.x86-freebsd
+index a30afdc..497334f 100644
+--- a/src/runtime/Config.x86-freebsd
++++ b/src/runtime/Config.x86-freebsd
+@@ -13,11 +13,11 @@ include Config.x86-bsd
  
  ASSEM_SRC += ldso-stubs.S
  
@@ -350,87 +378,104 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-freebsd sbcl-1.0.49/src/runti
  
  # use libthr (1:1 threading).  libpthread (m:n threading) does not work.
  ifdef LISP_FEATURE_SB_THREAD
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-linux sbcl-1.0.49/src/runtime/Config.x86-linux
---- sbcl-1.0.49.orig/src/runtime/Config.x86-linux	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.x86-linux	2011-06-08 17:50:43.422210525 +0200
-@@ -27,11 +27,11 @@
+diff --git a/src/runtime/Config.x86-linux b/src/runtime/Config.x86-linux
+index cabbf71..a5f9af4 100644
+--- a/src/runtime/Config.x86-linux
++++ b/src/runtime/Config.x86-linux
+@@ -27,13 +27,13 @@ OS_SRC = linux-os.c x86-linux-os.c
  # (You *are* encouraged to design and implement a coherent stable
  # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
  # working on one and it would be a nice thing to have.)
--LINKFLAGS += -Wl,--export-dynamic
-+SBCL_LDFLAGS += -Wl,--export-dynamic
+-LINKFLAGS += -Wl,--export-dynamic -m32
++SBCL_LDFLAGS += -Wl,--export-dynamic -m32
  OS_LIBS = -ldl
  
  ifdef LISP_FEATURE_LARGEFILE
 -  CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 +  SBCL_CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
  endif
+-CFLAGS += -m32 -fno-omit-frame-pointer
++SBCL_CFLAGS += -m32 -fno-omit-frame-pointer
  
  ifdef LISP_FEATURE_SB_THREAD
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-netbsd sbcl-1.0.49/src/runtime/Config.x86-netbsd
---- sbcl-1.0.49.orig/src/runtime/Config.x86-netbsd	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.x86-netbsd	2011-06-08 17:50:43.422210525 +0200
-@@ -13,6 +13,6 @@
+   OS_LIBS += -lpthread
+diff --git a/src/runtime/Config.x86-netbsd b/src/runtime/Config.x86-netbsd
+index b101bd1..53ff180 100644
+--- a/src/runtime/Config.x86-netbsd
++++ b/src/runtime/Config.x86-netbsd
+@@ -13,6 +13,6 @@ include Config.x86-bsd
  
  ASSEM_SRC += ldso-stubs.S
  OS_SRC += undefineds.c
 -LINKFLAGS += -dynamic -export-dynamic
-+LDFLAGS += -dynamic -export-dynamic
- 
--CFLAGS =  -g -Wall -O2
-+CFLAGS += -O2
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-openbsd sbcl-1.0.49/src/runtime/Config.x86-openbsd
---- sbcl-1.0.49.orig/src/runtime/Config.x86-openbsd	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.x86-openbsd	2011-06-08 17:50:43.422210525 +0200
-@@ -18,11 +18,6 @@
++SBCL_LDFLAGS += -dynamic -export-dynamic
+ 
+-CFLAGS = -g -Wall -O2 -fno-omit-frame-pointer
++SBCL_CFLAGS = -O2 -fno-omit-frame-pointer
+diff --git a/src/runtime/Config.x86-openbsd b/src/runtime/Config.x86-openbsd
+index 144cc2b..fc4a17e 100644
+--- a/src/runtime/Config.x86-openbsd
++++ b/src/runtime/Config.x86-openbsd
+@@ -18,11 +18,6 @@ OS_LIBS += -lutil
  # locations used. If you wish to link the runtime using -Z option then
  # please see the comments in src/compiler/x86/parms.lisp
  
 -# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS?
 -# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the
 -# dladdr test in tools-for-build/ to fail.
--
++SBCL_LDFLAGS += -export-dynamic
+ 
 -LINKFLAGS += -export-dynamic
- LDFLAGS += -export-dynamic
+-LDFLAGS += -export-dynamic
+-
+-CFLAGS = -g -Wall -O2 -fno-omit-frame-pointer
++SBCL_CFLAGS += -O2 -fno-omit-frame-pointer
+diff --git a/src/runtime/Config.x86-sunos b/src/runtime/Config.x86-sunos
+index 1367565..ab2d748 100644
+--- a/src/runtime/Config.x86-sunos
++++ b/src/runtime/Config.x86-sunos
+@@ -10,8 +10,8 @@
+ # files for more information.
  
--CFLAGS =  -g -Wall -O2
-+CFLAGS += -O2
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-sunos sbcl-1.0.49/src/runtime/Config.x86-sunos
---- sbcl-1.0.49.orig/src/runtime/Config.x86-sunos	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.x86-sunos	2011-06-08 17:50:43.422210525 +0200
-@@ -1,6 +1,5 @@
  CC=gcc
--CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT
+-CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
 -ASFLAGS = -Wall
-+CFLAGS += -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT
++SBCL_CFLAGS += -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
++SBCL_ASFLAGS += -Wall
  LD = ld
  NM = nm -xgp
  GREP = ggrep
-diff -Naur sbcl-1.0.49.orig/src/runtime/Config.x86-win32 sbcl-1.0.49/src/runtime/Config.x86-win32
---- sbcl-1.0.49.orig/src/runtime/Config.x86-win32	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/Config.x86-win32	2011-06-08 18:02:18.182444901 +0200
-@@ -25,13 +25,13 @@
+diff --git a/src/runtime/Config.x86_64-linux b/src/runtime/Config.x86_64-linux
+index e1efb79..ea0f567 100644
+--- a/src/runtime/Config.x86_64-linux
++++ b/src/runtime/Config.x86_64-linux
+@@ -27,18 +27,18 @@ OS_SRC = linux-os.c x86-64-linux-os.c
  # (You *are* encouraged to design and implement a coherent stable
  # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
  # working on one and it would be a nice thing to have.)
--OS_LINK_FLAGS = -Wl,--export-dynamic
--OS_LIBS =
-+OS_LINK_FLAGS += -Wl,--export-dynamic
-+OS_LIBS +=
+-LINKFLAGS += -Wl,--export-dynamic
++LDFLAGS += -Wl,--export-dynamic
+ OS_LIBS = -ldl
  
- GC_SRC = gencgc.c
+ ifdef LISP_FEATURE_LARGEFILE
+-  CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++  SBCL_CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ endif
  
--CFLAGS =  -g -Wall -O3
--ASFLAGS = $(CFLAGS)
-+CFLAGS +=  -g -Wall -O3
-+ASFLAGS += $(CFLAGS)
+ ifdef LISP_FEATURE_SB_THREAD
+   OS_LIBS += -lpthread
+ endif
  
- CPP = cpp
- CC = gcc
-diff -Naur sbcl-1.0.49.orig/src/runtime/GNUmakefile sbcl-1.0.49/src/runtime/GNUmakefile
---- sbcl-1.0.49.orig/src/runtime/GNUmakefile	2011-06-05 21:35:34.000000000 +0200
-+++ sbcl-1.0.49/src/runtime/GNUmakefile	2011-06-08 17:50:43.425543844 +0200
-@@ -18,27 +18,19 @@
+-CFLAGS += -fno-omit-frame-pointer
++SBCL_CFLAGS += -fno-omit-frame-pointer
+ 
+ GC_SRC = gencgc.c
+ 
+diff --git a/src/runtime/GNUmakefile b/src/runtime/GNUmakefile
+index f0fbe19..6dc0581 100644
+--- a/src/runtime/GNUmakefile
++++ b/src/runtime/GNUmakefile
+@@ -18,27 +18,19 @@ TARGET=sbcl
  # Config file. Most of them are same on most systems right now.
  # If you need to override one of these, do it in Config.
  LD = ld
@@ -445,7 +490,10 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/GNUmakefile sbcl-1.0.49/src/runtime/GNUm
 -CFLAGS = -g -Wall -Wsign-compare -O3
 -ASFLAGS = $(CFLAGS)
 -CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
--
++SBCL_CFLAGS = -g -Wall -Wsign-compare -O3
++SBCL_ASFLAGS = $(SBCL_CFLAGS)
++SBCL_CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
+ 
 -# Give make access to the target Lisp features.
 -include genesis/Makefile.features
 -
@@ -456,16 +504,12 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/GNUmakefile sbcl-1.0.49/src/runtime/GNUm
 -# Commonly used variables in Config are: ARCH_SRC, ASSEM_SRC, GC_SRC,
 -# OS_SRC, OS_LIBS, OS_OBJS, OS_CLEAN_FILES
 -include Config
-+SBCL_CFLAGS = -g -Wall -Wsign-compare -O3
-+SBCL_ASFLAGS = $(SBCL_CFLAGS)
-+SBCL_CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
-+
 +# Also included by tools-for-build/Makefile
 +-include platform.mk
  
  COMMON_SRC = alloc.c backtrace.c breakpoint.c coreparse.c \
  	dynbind.c funcall.c gc-common.c globals.c interr.c interrupt.c \
-@@ -58,7 +50,7 @@
+@@ -58,7 +50,7 @@ LIBS = ${OS_LIBS} -lm
  targets: $(TARGET) sbcl.nm
  
  $(TARGET): $(OBJS)
@@ -474,9 +518,11 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/GNUmakefile sbcl-1.0.49/src/runtime/GNUm
  
  sbcl.nm: $(TARGET)
  	$(NM) $(TARGET) | $(GREP) -v " [FUw] " > ,$@
-diff -Naur sbcl-1.0.49.orig/src/runtime/platform.mk sbcl-1.0.49/src/runtime/platform.mk
---- sbcl-1.0.49.orig/src/runtime/platform.mk	1970-01-01 01:00:00.000000000 +0100
-+++ sbcl-1.0.49/src/runtime/platform.mk	2011-06-08 17:50:43.428877162 +0200
+diff --git a/src/runtime/platform.mk b/src/runtime/platform.mk
+new file mode 100644
+index 0000000..d2470cd
+--- /dev/null
++++ b/src/runtime/platform.mk
 @@ -0,0 +1,17 @@
 +# -*- makefile -*- for the C-level run-time support for SBCL
 +
@@ -495,9 +541,10 @@ diff -Naur sbcl-1.0.49.orig/src/runtime/platform.mk sbcl-1.0.49/src/runtime/plat
 +CFLAGS   := $(SBCL_CFLAGS)   $(CFLAGS)
 +ASFLAGS  := $(SBCL_ASFLAGS)  $(ASFLAGS)
 +LDFLAGS  := $(SBCL_LDFLAGS)  $(LDFLAGS)
-diff -Naur sbcl-1.0.49.orig/tools-for-build/Makefile sbcl-1.0.49/tools-for-build/Makefile
---- sbcl-1.0.49.orig/tools-for-build/Makefile	2011-06-05 21:35:35.000000000 +0200
-+++ sbcl-1.0.49/tools-for-build/Makefile	2011-06-08 17:50:43.428877162 +0200
+diff --git a/tools-for-build/Makefile b/tools-for-build/Makefile
+index 7a4c16f..dc99ebc 100644
+--- a/tools-for-build/Makefile
++++ b/tools-for-build/Makefile
 @@ -7,12 +7,11 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.

diff --git a/dev-lisp/sbcl/sbcl-1.0.51.ebuild b/dev-lisp/sbcl/sbcl-1.0.51.ebuild
index ccc2eda..4c47165 100644
--- a/dev-lisp/sbcl/sbcl-1.0.51.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.0.51.ebuild
@@ -77,7 +77,6 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-gentoo-fix_build_system.patch
-	epatch "${FILESDIR}"/${PV}-fix-linux-kernel-version-parsing.patch
 	epatch "${FILESDIR}"/gentoo-fix_install_man.patch
 	epatch "${FILESDIR}"/gentoo-fix_linux-os-c.patch
 



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
@ 2011-11-04 10:10 Stelian Ionescu
  0 siblings, 0 replies; 13+ messages in thread
From: Stelian Ionescu @ 2011-11-04 10:10 UTC (permalink / raw
  To: gentoo-commits

commit:     bdf1583eeb73a130d592e535a5d18f5ee38691c3
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Fri Nov  4 10:10:06 2011 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Fri Nov  4 10:10:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=bdf1583e

dev-lisp/sbcl: bump to 1.0.52

Remove build system patch because it's too much work to port it forward

---
 .../files/1.0.51-gentoo-fix_build_system.patch     |  564 --------------------
 .../{sbcl-1.0.51.ebuild => sbcl-1.0.52.ebuild}     |    1 -
 2 files changed, 0 insertions(+), 565 deletions(-)

diff --git a/dev-lisp/sbcl/files/1.0.51-gentoo-fix_build_system.patch b/dev-lisp/sbcl/files/1.0.51-gentoo-fix_build_system.patch
deleted file mode 100644
index f3dbbc7..0000000
--- a/dev-lisp/sbcl/files/1.0.51-gentoo-fix_build_system.patch
+++ /dev/null
@@ -1,564 +0,0 @@
-diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
-index d3ffbad..7a5936e 100644
---- a/contrib/asdf-module.mk
-+++ b/contrib/asdf-module.mk
-@@ -1,3 +1,5 @@
-+# -*- makefile -*- included by contribs built with ASDF
-+
- CC=gcc
- 
- # We need to extend flags to the C compiler and the linker
-@@ -7,6 +9,9 @@ CC=gcc
- # directly via ASDF from a non-C-aware module which has these tricky
- # ones as dependencies.
- 
-+# from src/runtime/
-+-include platform.mk
-+
- UNAME:=$(shell uname -s)
- 
- ifeq (SunOS,$(UNAME))
-@@ -23,7 +28,9 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
-   CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC))))
- endif
- 
--export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
-+EXTRA_CFLAGS += $(CFLAGS)
-+
-+export CC SBCL EXTRA_CFLAGS
- 
- all: $(EXTRA_ALL_TARGETS)
- 	$(MAKE) -C ../asdf
-diff --git a/contrib/vanilla-module.mk b/contrib/vanilla-module.mk
-index 41c1771..4c343ee 100644
---- a/contrib/vanilla-module.mk
-+++ b/contrib/vanilla-module.mk
-@@ -1,3 +1,7 @@
-+# -*- makefile -*- included by contribs that don't use ASDF
-+
-+# from src/runtime/
-+-include platform.mk
- 
- $(MODULE).fasl: $(MODULE).lisp ../../output/sbcl.core
- 	$(SBCL) --eval '(compile-file (format nil "SYS:CONTRIB;~:@(~A~);~:@(~A~).LISP" "$(MODULE)" "$(MODULE)"))' </dev/null
-diff --git a/make-target-contrib.sh b/make-target-contrib.sh
-index 85345e6..e3185d8 100644
---- a/make-target-contrib.sh
-+++ b/make-target-contrib.sh
-@@ -66,7 +66,7 @@ for i in contrib/*; do
-     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
-     test -f $i/test-passed && rm $i/test-passed
-     # hack to get exit codes right.
--    if $GNUMAKE -C $i test 2>&1 && touch $i/test-passed ; then
-+    if $GNUMAKE -C $i -I ../../src/runtime test 2>&1 && touch $i/test-passed ; then
- 	:
-     else
- 	exit $?
-diff --git a/src/runtime/Config.alpha-linux b/src/runtime/Config.alpha-linux
-index 42df1fc..50de020 100644
---- a/src/runtime/Config.alpha-linux
-+++ b/src/runtime/Config.alpha-linux
-@@ -10,7 +10,7 @@
- # files for more information.
- 
- LD = ld -taso
--LINKFLAGS += -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynamic
-+SBCL_LDFLAGS += -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynamic
- NM = ./linux-nm
- 
- ASSEM_SRC = alpha-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.alpha-osf1 b/src/runtime/Config.alpha-osf1
-index 0553f48..8c39543 100644
---- a/src/runtime/Config.alpha-osf1
-+++ b/src/runtime/Config.alpha-osf1
-@@ -9,11 +9,10 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--CFLAGS += -Dosf1 -O0 -g -D_XOPEN_SOURCE=500 -D_OSF_SOURCE=500
--CFLAGS += -msg_disable newlocale
-+CFLAGS += -Dosf1 -O0 -D_XOPEN_SOURCE=500 -D_OSF_SOURCE=500 -msg_disable newlocale
- ASFLAGS += -Dosf1 #-ULANGUAGE_ASSEMBLY
- LD = ld -xtaso
--LINKFLAGS = -non_shared # dynamic -v -g  -Wl,-T  -Wl,ld-script.alpha-linux
-+LDFLAGS += -non_shared # dynamic -v -g  -Wl,-T  -Wl,ld-script.alpha-linux
- # Digital^WCompaq^WHP's cc declares `static inline' functions to exist
- # in multiple places in the binary; we add the '-g' flag to suppress all
- # internal (i.e. static) function names being spat out.  GENESIS
-diff --git a/src/runtime/Config.hppa-hpux b/src/runtime/Config.hppa-hpux
-index fec282b..7509a60 100644
---- a/src/runtime/Config.hppa-hpux
-+++ b/src/runtime/Config.hppa-hpux
-@@ -9,7 +9,7 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--LINKFLAGS += -v
-+LDFLAGS += -v
- # avoid native tools
- NM = /usr/local/bin/nm
- CC = /usr/local/bin/gcc
-diff --git a/src/runtime/Config.hppa-linux b/src/runtime/Config.hppa-linux
-index 72449bd..1145452 100644
---- a/src/runtime/Config.hppa-linux
-+++ b/src/runtime/Config.hppa-linux
-@@ -9,7 +9,7 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--LINKFLAGS += -v -static
-+SBCL_LDFLAGS += -v -static
- NM = ./linux-nm
- 
- ASSEM_SRC = hppa-assem.S #hppa-linux-stubs.S
-diff --git a/src/runtime/Config.mips-linux b/src/runtime/Config.mips-linux
-index 9f32f3c..88cc65c 100644
---- a/src/runtime/Config.mips-linux
-+++ b/src/runtime/Config.mips-linux
-@@ -9,7 +9,7 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--LINKFLAGS += -v -O2 -Wl,--export-dynamic
-+SBCL_LDFLAGS += -v -O2 -Wl,--export-dynamic
- NM = ./linux-nm
- 
- ASSEM_SRC = mips-assem.S ldso-stubs.S
-@@ -19,7 +19,7 @@ OS_SRC = linux-os.c mips-linux-os.c
- OS_LIBS = -ldl
- 
- ifdef LISP_FEATURE_LARGEFILE
--  CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+  SBCL_CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- endif
- 
- ifdef LISP_FEATURE_SB_THREAD
-diff --git a/src/runtime/Config.ppc-darwin b/src/runtime/Config.ppc-darwin
-index 0d3d79a..ea3eaf7 100644
---- a/src/runtime/Config.ppc-darwin
-+++ b/src/runtime/Config.ppc-darwin
-@@ -9,8 +9,8 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--CFLAGS = -g -Wall -O2 -fdollars-in-identifiers -mmacosx-version-min=10.4
--LINKFLAGS += -mmacosx-version-min=10.4
-+CFLAGS += -O2 -fdollars-in-identifiers -mmacosx-version-min=10.4
-+LDFLAGS += -mmacosx-version-min=10.4
- 
- OS_SRC = bsd-os.c darwin-os.c ppc-darwin-os.c
- 
-diff --git a/src/runtime/Config.ppc-linux b/src/runtime/Config.ppc-linux
-index f8ceded..77fa228 100644
---- a/src/runtime/Config.ppc-linux
-+++ b/src/runtime/Config.ppc-linux
-@@ -9,8 +9,7 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--CFLAGS = -g
--LINKFLAGS += -v -rdynamic
-+SBCL_LDFLAGS += -v -rdynamic
- NM = ./linux-nm
- 
- ASSEM_SRC = ppc-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.ppc-netbsd b/src/runtime/Config.ppc-netbsd
-index 07f668e..a17ebc7 100644
---- a/src/runtime/Config.ppc-netbsd
-+++ b/src/runtime/Config.ppc-netbsd
-@@ -9,8 +9,8 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--LINKFLAGS += -dynamic -export-dynamic
--CFLAGS =  -g -Wall -O2
-+LDFLAGS += -dynamic -export-dynamic
-+CFLAGS += -O2
- 
- ASSEM_SRC = ppc-assem.S ldso-stubs.S
- ARCH_SRC = ppc-arch.c
-diff --git a/src/runtime/Config.sparc-linux b/src/runtime/Config.sparc-linux
-index 1ad0213..4b4f389 100644
---- a/src/runtime/Config.sparc-linux
-+++ b/src/runtime/Config.sparc-linux
-@@ -9,8 +9,7 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--ASFLAGS = -g -Wall
--LINKFLAGS += -v -rdynamic
-+SBCL_LDFLAGS += -v -rdynamic
- NM = ./linux-nm
- 
- ASSEM_SRC = sparc-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.sparc-netbsd b/src/runtime/Config.sparc-netbsd
-index ec95cf8..7ca8cab 100644
---- a/src/runtime/Config.sparc-netbsd
-+++ b/src/runtime/Config.sparc-netbsd
-@@ -10,8 +10,8 @@
- # files for more information.
- 
- CC = gcc
--CFLAGS += -g -Wall -O2
--LINKFLAGS += -v
-+CFLAGS += -O2
-+LDFLAGS += -v
- NM = nm -t x -p
- 
- ASSEM_SRC = sparc-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.sparc-sunos b/src/runtime/Config.sparc-sunos
-index c5c89b8..7ca56e8 100644
---- a/src/runtime/Config.sparc-sunos
-+++ b/src/runtime/Config.sparc-sunos
-@@ -11,8 +11,8 @@
- 
- CC = gcc
- CFLAGS += -DSVR4 -D_REENTRANT
--ASFLAGS = -g -Wall -DSVR4
--LINKFLAGS += -v
-+ASFLAGS += -DSVR4
-+LDFLAGS += -v
- NM = nm -t x -p 
- 
- ASSEM_SRC = sparc-assem.S ldso-stubs.S
-diff --git a/src/runtime/Config.x86-64-darwin b/src/runtime/Config.x86-64-darwin
-index 24965f5..efecb06 100644
---- a/src/runtime/Config.x86-64-darwin
-+++ b/src/runtime/Config.x86-64-darwin
-@@ -9,13 +9,15 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--CFLAGS = -g -Wall -O2 -fdollars-in-identifiers
-+CFLAGS += -arch x86_64 -O2 -fdollars-in-identifier
-+LDFLAGS += -arch x86_64
-+
- ifdef LISP_FEATURE_DARWIN9_OR_BETTER
- CFLAGS += -mmacosx-version-min=10.5
--LINKFLAGS += -mmacosx-version-min=10.5
-+LDFLAGS += -mmacosx-version-min=10.5
- else
- CFLAGS += -mmacosx-version-min=10.4
--LINKFLAGS += -mmacosx-version-min=10.4
-+LDFLAGS += -mmacosx-version-min=10.4
- endif
- ifdef LISP_FEATURE_INODE64
- CFLAGS += -D_DARWIN_USE_64_BIT_INODE
-@@ -31,9 +33,9 @@ endif
- ASSEM_SRC = x86-64-assem.S ldso-stubs.S
- ARCH_SRC = x86-64-arch.c
- 
--LINKFLAGS += -arch x86_64 -dynamic -twolevel_namespace -bind_at_load -pagezero_size 0x100000
-+LDFLAGS += -dynamic -twolevel_namespace -bind_at_load -pagezero_size 0x100000
- 
--CFLAGS += -arch x86_64 -fno-omit-frame-pointer -pagezero_size 0x100000
-+CFLAGS += -fno-omit-frame-pointer -pagezero_size 0x100000
- 
- GC_SRC = gencgc.c
- 
-diff --git a/src/runtime/Config.x86-64-freebsd b/src/runtime/Config.x86-64-freebsd
-index cb35476..2945aa5 100644
---- a/src/runtime/Config.x86-64-freebsd
-+++ b/src/runtime/Config.x86-64-freebsd
-@@ -13,11 +13,11 @@ include Config.x86-64-bsd
- 
- ASSEM_SRC += ldso-stubs.S
- 
--# Until sbcl-0.6.7.3, we used "LINKFLAGS+=-static" here, which
-+# Until sbcl-0.6.7.3, we used "LDFLAGS+=-static" here, which
- # worked fine for most things, but LOAD-FOREIGN & friends require
- # dlopen() etc., which in turn depend on dynamic linking of the
- # runtime.
--LINKFLAGS += -dynamic -export-dynamic
-+LDFLAGS += -dynamic -export-dynamic
- 
- # use libthr (1:1 threading).  libpthread (m:n threading) does not work.
- ifdef LISP_FEATURE_SB_THREAD
-diff --git a/src/runtime/Config.x86-64-netbsd b/src/runtime/Config.x86-64-netbsd
-index e893ee0..41e66ba 100644
---- a/src/runtime/Config.x86-64-netbsd
-+++ b/src/runtime/Config.x86-64-netbsd
-@@ -14,9 +14,4 @@ include Config.x86-64-bsd
- ASSEM_SRC += ldso-stubs.S
- OS_LIBS += -lutil
- 
--# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS?
--# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the
--# dladdr test in tools-for-build/ to fail.
--
--LINKFLAGS += -export-dynamic
- LDFLAGS += -export-dynamic
-diff --git a/src/runtime/Config.x86-64-openbsd b/src/runtime/Config.x86-64-openbsd
-index e893ee0..41e66ba 100644
---- a/src/runtime/Config.x86-64-openbsd
-+++ b/src/runtime/Config.x86-64-openbsd
-@@ -14,9 +14,4 @@ include Config.x86-64-bsd
- ASSEM_SRC += ldso-stubs.S
- OS_LIBS += -lutil
- 
--# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS?
--# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the
--# dladdr test in tools-for-build/ to fail.
--
--LINKFLAGS += -export-dynamic
- LDFLAGS += -export-dynamic
-diff --git a/src/runtime/Config.x86-64-sunos b/src/runtime/Config.x86-64-sunos
-index 8441cef..208a4f7 100644
---- a/src/runtime/Config.x86-64-sunos
-+++ b/src/runtime/Config.x86-64-sunos
-@@ -1,14 +1,14 @@
- CC=gcc
--CFLAGS = -m64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
--ASFLAGS = -m64 -Wall
-+CFLAGS += -m64 -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
-+ASFLAGS += -m64
- LD = ld
--LINKFLAGS = -m64 -g
-+LDFLAGS += -m64 -g
- NM = nm -xgp
- GREP = ggrep
- 
- #CC=/opt/SunStudioExpress/bin/cc
--#CFLAGS = -xarch=generic64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
--#ASFLAGS = -xarch=generic64 -Wall
-+#CFLAGS += -xarch=generic64 -g -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
-+#ASFLAGS += -xarch=generic64
- 
- ASSEM_SRC = x86-64-assem.S ldso-stubs.S
- ARCH_SRC = x86-64-arch.c
-diff --git a/src/runtime/Config.x86-darwin b/src/runtime/Config.x86-darwin
-index df53b0c..4e6683d 100644
---- a/src/runtime/Config.x86-darwin
-+++ b/src/runtime/Config.x86-darwin
-@@ -9,14 +9,14 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
--CFLAGS = -arch i386 -g -Wall -O2 -fdollars-in-identifiers -fno-omit-frame-pointer
--LINKFLAGS += -arch i386
-+SBCL_CFLAGS += -arch i386 -O2 -fdollars-in-identifiers -fno-omit-frame-pointer
-+SBCL_LDFLAGS += -arch i386
- ifdef LISP_FEATURE_DARWIN9_OR_BETTER
--CFLAGS += -mmacosx-version-min=10.5
--LINKFLAGS += -mmacosx-version-min=10.5
-+SBCL_CFLAGS += -mmacosx-version-min=10.5
-+SBCL_LDFLAGS += -mmacosx-version-min=10.5
- else
--CFLAGS += -mmacosx-version-min=10.4
--LINKFLAGS += -mmacosx-version-min=10.4
-+SBCL_CFLAGS += -mmacosx-version-min=10.4
-+SBCL_LDFLAGS += -mmacosx-version-min=10.4
- endif
- 
- OS_SRC = bsd-os.c x86-bsd-os.c darwin-os.c x86-darwin-os.c
-@@ -31,7 +31,7 @@ CC = gcc
- ASSEM_SRC = x86-assem.S ldso-stubs.S
- ARCH_SRC = x86-arch.c
- 
--CPPFLAGS += -no-cpp-precomp
-+SBCL_CPPFLAGS += -no-cpp-precomp
- 
- GC_SRC = gencgc.c
- 
-diff --git a/src/runtime/Config.x86-freebsd b/src/runtime/Config.x86-freebsd
-index a30afdc..497334f 100644
---- a/src/runtime/Config.x86-freebsd
-+++ b/src/runtime/Config.x86-freebsd
-@@ -13,11 +13,11 @@ include Config.x86-bsd
- 
- ASSEM_SRC += ldso-stubs.S
- 
--# Until sbcl-0.6.7.3, we used "LINKFLAGS+=-static" here, which
-+# Until sbcl-0.6.7.3, we used "LDFLAGS+=-static" here, which
- # worked fine for most things, but LOAD-FOREIGN & friends require
- # dlopen() etc., which in turn depend on dynamic linking of the
- # runtime.
--LINKFLAGS += -dynamic -export-dynamic
-+LDFLAGS += -dynamic -export-dynamic
- 
- # use libthr (1:1 threading).  libpthread (m:n threading) does not work.
- ifdef LISP_FEATURE_SB_THREAD
-diff --git a/src/runtime/Config.x86-linux b/src/runtime/Config.x86-linux
-index cabbf71..a5f9af4 100644
---- a/src/runtime/Config.x86-linux
-+++ b/src/runtime/Config.x86-linux
-@@ -27,13 +27,13 @@ OS_SRC = linux-os.c x86-linux-os.c
- # (You *are* encouraged to design and implement a coherent stable
- # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
- # working on one and it would be a nice thing to have.)
--LINKFLAGS += -Wl,--export-dynamic -m32
-+SBCL_LDFLAGS += -Wl,--export-dynamic -m32
- OS_LIBS = -ldl
- 
- ifdef LISP_FEATURE_LARGEFILE
--  CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+  SBCL_CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- endif
--CFLAGS += -m32 -fno-omit-frame-pointer
-+SBCL_CFLAGS += -m32 -fno-omit-frame-pointer
- 
- ifdef LISP_FEATURE_SB_THREAD
-   OS_LIBS += -lpthread
-diff --git a/src/runtime/Config.x86-netbsd b/src/runtime/Config.x86-netbsd
-index b101bd1..53ff180 100644
---- a/src/runtime/Config.x86-netbsd
-+++ b/src/runtime/Config.x86-netbsd
-@@ -13,6 +13,6 @@ include Config.x86-bsd
- 
- ASSEM_SRC += ldso-stubs.S
- OS_SRC += undefineds.c
--LINKFLAGS += -dynamic -export-dynamic
-+SBCL_LDFLAGS += -dynamic -export-dynamic
- 
--CFLAGS = -g -Wall -O2 -fno-omit-frame-pointer
-+SBCL_CFLAGS = -O2 -fno-omit-frame-pointer
-diff --git a/src/runtime/Config.x86-openbsd b/src/runtime/Config.x86-openbsd
-index 144cc2b..fc4a17e 100644
---- a/src/runtime/Config.x86-openbsd
-+++ b/src/runtime/Config.x86-openbsd
-@@ -18,11 +18,6 @@ OS_LIBS += -lutil
- # locations used. If you wish to link the runtime using -Z option then
- # please see the comments in src/compiler/x86/parms.lisp
- 
--# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS?
--# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the
--# dladdr test in tools-for-build/ to fail.
-+SBCL_LDFLAGS += -export-dynamic
- 
--LINKFLAGS += -export-dynamic
--LDFLAGS += -export-dynamic
--
--CFLAGS = -g -Wall -O2 -fno-omit-frame-pointer
-+SBCL_CFLAGS += -O2 -fno-omit-frame-pointer
-diff --git a/src/runtime/Config.x86-sunos b/src/runtime/Config.x86-sunos
-index 1367565..ab2d748 100644
---- a/src/runtime/Config.x86-sunos
-+++ b/src/runtime/Config.x86-sunos
-@@ -10,8 +10,8 @@
- # files for more information.
- 
- CC=gcc
--CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
--ASFLAGS = -Wall
-+SBCL_CFLAGS += -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
-+SBCL_ASFLAGS += -Wall
- LD = ld
- NM = nm -xgp
- GREP = ggrep
-diff --git a/src/runtime/Config.x86_64-linux b/src/runtime/Config.x86_64-linux
-index e1efb79..ea0f567 100644
---- a/src/runtime/Config.x86_64-linux
-+++ b/src/runtime/Config.x86_64-linux
-@@ -27,18 +27,18 @@ OS_SRC = linux-os.c x86-64-linux-os.c
- # (You *are* encouraged to design and implement a coherent stable
- # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
- # working on one and it would be a nice thing to have.)
--LINKFLAGS += -Wl,--export-dynamic
-+LDFLAGS += -Wl,--export-dynamic
- OS_LIBS = -ldl
- 
- ifdef LISP_FEATURE_LARGEFILE
--  CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+  SBCL_CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- endif
- 
- ifdef LISP_FEATURE_SB_THREAD
-   OS_LIBS += -lpthread
- endif
- 
--CFLAGS += -fno-omit-frame-pointer
-+SBCL_CFLAGS += -fno-omit-frame-pointer
- 
- GC_SRC = gencgc.c
- 
-diff --git a/src/runtime/GNUmakefile b/src/runtime/GNUmakefile
-index f0fbe19..6dc0581 100644
---- a/src/runtime/GNUmakefile
-+++ b/src/runtime/GNUmakefile
-@@ -18,27 +18,19 @@ TARGET=sbcl
- # Config file. Most of them are same on most systems right now.
- # If you need to override one of these, do it in Config.
- LD = ld
--LINKFLAGS = -g
-+SBCL_LDFLAGS = -g
- NM = nm -gp
- DEPEND_FLAGS = -MM
- GREP = grep
- 
- include ../../output/prefix.def
- 
--CFLAGS = -g -Wall -Wsign-compare -O3
--ASFLAGS = $(CFLAGS)
--CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
-+SBCL_CFLAGS = -g -Wall -Wsign-compare -O3
-+SBCL_ASFLAGS = $(SBCL_CFLAGS)
-+SBCL_CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
- 
--# Give make access to the target Lisp features.
--include genesis/Makefile.features
--
--# The Config file is the preferred place for tweaking options which
--# are appropriate for particular setups (OS, ARCH, whatever). Make a
--# Config-foo file for setup foo, then arrange for Config to be a
--# symlink to Config-foo.
--# Commonly used variables in Config are: ARCH_SRC, ASSEM_SRC, GC_SRC,
--# OS_SRC, OS_LIBS, OS_OBJS, OS_CLEAN_FILES
--include Config
-+# Also included by tools-for-build/Makefile
-+-include platform.mk
- 
- COMMON_SRC = alloc.c backtrace.c breakpoint.c coreparse.c \
- 	dynbind.c funcall.c gc-common.c globals.c interr.c interrupt.c \
-@@ -58,7 +50,7 @@ LIBS = ${OS_LIBS} -lm
- targets: $(TARGET) sbcl.nm
- 
- $(TARGET): $(OBJS)
--	$(CC) ${LINKFLAGS} -o $@ $^ $(LIBS)
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- sbcl.nm: $(TARGET)
- 	$(NM) $(TARGET) | $(GREP) -v " [FUw] " > ,$@
-diff --git a/src/runtime/platform.mk b/src/runtime/platform.mk
-new file mode 100644
-index 0000000..d2470cd
---- /dev/null
-+++ b/src/runtime/platform.mk
-@@ -0,0 +1,17 @@
-+# -*- makefile -*- for the C-level run-time support for SBCL
-+
-+# Give make access to the target Lisp features.
-+-include genesis/Makefile.features
-+
-+# The Config file is the preferred place for tweaking options which
-+# are appropriate for particular setups (OS, ARCH, whatever). Make a
-+# Config-foo file for setup foo, then arrange for Config to be a
-+# symlink to Config-foo.
-+# Commonly used variables in Config are: ARCH_SRC, ASSEM_SRC, GC_SRC,
-+# OS_SRC, OS_LIBS, OS_OBJS, OS_CLEAN_FILES
-+-include Config
-+
-+CPPFLAGS := $(SBCL_CPPFLAGS) $(CPPFLAGS)
-+CFLAGS   := $(SBCL_CFLAGS)   $(CFLAGS)
-+ASFLAGS  := $(SBCL_ASFLAGS)  $(ASFLAGS)
-+LDFLAGS  := $(SBCL_LDFLAGS)  $(LDFLAGS)
-diff --git a/tools-for-build/Makefile b/tools-for-build/Makefile
-index 7a4c16f..dc99ebc 100644
---- a/tools-for-build/Makefile
-+++ b/tools-for-build/Makefile
-@@ -7,12 +7,11 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
---include genesis/Makefile.features
---include Config
-+SBCL_CPPFLAGS = -I../src/runtime
-+SBCL_LDFLAGS = $(OS_LIBS)
- 
--CPPFLAGS:=-I../src/runtime
--LDFLAGS:=$(LDFLAGS)
--LDLIBS:=$(OS_LIBS)
-+# from src/runtime/
-+-include platform.mk
- 
- all: grovel-headers determine-endianness where-is-mcontext \
-         modify-ldt-struct-name sigaction-sa-nodefer-works-test

diff --git a/dev-lisp/sbcl/sbcl-1.0.51.ebuild b/dev-lisp/sbcl/sbcl-1.0.52.ebuild
similarity index 99%
rename from dev-lisp/sbcl/sbcl-1.0.51.ebuild
rename to dev-lisp/sbcl/sbcl-1.0.52.ebuild
index 4c47165..038f2e3 100644
--- a/dev-lisp/sbcl/sbcl-1.0.51.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.0.52.ebuild
@@ -76,7 +76,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gentoo-fix_build_system.patch
 	epatch "${FILESDIR}"/gentoo-fix_install_man.patch
 	epatch "${FILESDIR}"/gentoo-fix_linux-os-c.patch
 



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
@ 2012-02-04 20:15 Stelian Ionescu
  0 siblings, 0 replies; 13+ messages in thread
From: Stelian Ionescu @ 2012-02-04 20:15 UTC (permalink / raw
  To: gentoo-commits

commit:     d53dcd68eacc7a874c574c842ec649ea30cdf145
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Sat Feb  4 20:05:22 2012 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Sat Feb  4 20:05:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=d53dcd68

dev-lisp/sbcl: disable hardened features, bump to -r1

---
 .../gentoo-fix_nopie_for_hardened_toolchain.patch  |   24 +++
 dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild                |  196 ++++++++++++++++++++
 2 files changed, 220 insertions(+), 0 deletions(-)

diff --git a/dev-lisp/sbcl/files/gentoo-fix_nopie_for_hardened_toolchain.patch b/dev-lisp/sbcl/files/gentoo-fix_nopie_for_hardened_toolchain.patch
new file mode 100644
index 0000000..d4f94ca
--- /dev/null
+++ b/dev-lisp/sbcl/files/gentoo-fix_nopie_for_hardened_toolchain.patch
@@ -0,0 +1,24 @@
+diff -ur b/src/runtime/Config.x86-linux a/src/runtime/Config.x86-linux
+--- b/src/runtime/Config.x86-linux	2012-01-09 02:08:10.000000000 +0000
++++ a/src/runtime/Config.x86-linux	2012-02-02 14:32:56.000000000 +0000
+@@ -27,7 +27,7 @@
+ # (You *are* encouraged to design and implement a coherent stable
+ # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
+ # working on one and it would be a nice thing to have.)
+-LINKFLAGS += -Wl,--export-dynamic -m32
++LINKFLAGS += -Wl,--export-dynamic -m32 -nopie
+ OS_LIBS = -ldl
+ 
+ ifdef LISP_FEATURE_LARGEFILE
+diff -ur b/src/runtime/Config.x86_64-linux a/src/runtime/Config.x86_64-linux
+--- b/src/runtime/Config.x86_64-linux	2012-01-09 02:08:10.000000000 +0000
++++ a/src/runtime/Config.x86_64-linux	2012-02-02 14:32:44.000000000 +0000
+@@ -27,7 +27,7 @@
+ # (You *are* encouraged to design and implement a coherent stable
+ # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
+ # working on one and it would be a nice thing to have.)
+-LINKFLAGS += -Wl,--export-dynamic
++LINKFLAGS += -Wl,--export-dynamic -nopie
+ OS_LIBS = -ldl
+ 
+ ifdef LISP_FEATURE_LARGEFILE

diff --git a/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild b/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild
new file mode 100644
index 0000000..aaa8c8d
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.0.37
+BV_AMD64=1.0.37
+BV_PPC=1.0.28
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_MIPS=1.0.23
+BV_MIPSEL=1.0.28
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	mips? ( !cobalt? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.bz2 ) )
+	mips? ( cobalt? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPSEL}-mipsel-linux-binary.tar.bz2 ) )"
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+asdf ldb source +threads +unicode debug doc cobalt"
+
+DEPEND="doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
+RDEPEND="elibc_glibc? ( >=sys-libs/glibc-2.3 || ( <sys-libs/glibc-2.6[nptl] >=sys-libs/glibc-2.6 ) )
+		asdf? ( >=dev-lisp/gentoo-init-1.0 )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	cat > "${CONFIG}" <<'EOF'
+(lambda (list)
+  (flet ((enable  (x) (pushnew x list))
+		 (disable (x) (setf list (remove x list))))
+EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "$(usep ldb)" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	cat >> "${CONFIG}" <<'EOF'
+	)
+  list)
+EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-linux sbcl-binary
+	cd "${S}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/gentoo-fix_install_man.patch
+	epatch "${FILESDIR}"/gentoo-fix_linux-os-c.patch
+
+	# To make the hardened compiler NOT compile with -fPIE -pie
+	if gcc-specs-pie ; then
+		einfo "Disabling PIE..."
+		epatch "${FILESDIR}"/gentoo-fix_nopie_for_hardened_toolchain.patch
+	fi
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh
+	sed "s,/lib,/$(get_libdir),g" -i install.sh
+	sed "s,/usr/local/lib,/usr/$(get_libdir),g" -i src/runtime/runtime.c # #define SBCL_HOME ...
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
+
+	if host-is-pax ; then
+		# To disable PaX on hardened systems
+		pax-mark -C "${bindir}"/src/runtime/sbcl
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/load/!s/^echo \/\/doing warm.*$/&\npaxctl -C \.\/src\/runtime\/sbcl\npaxctl -mprexs \.\/src\/runtime\/sbcl/' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug 174702
+	# set HOME for paludis
+	env - HOME="${T}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	cat > "${D}"/etc/sbclrc <<EOF
+;;; The following is required if you want source location functions to
+;;; work in SLIME, for example.
+
+(setf (logical-pathname-translations "SYS")
+	'(("SYS:SRC;**;*.*.*" #p"/usr/$(get_libdir)/sbcl/src/**/*.*")
+	  ("SYS:CONTRIB;**;*.*.*" #p"/usr/$(get_libdir)/sbcl/**/*.*")))
+EOF
+	if use asdf; then
+		cat >> "${D}"/etc/sbclrc <<EOF
+
+;;; Setup ASDF2
+(load "/etc/common-lisp/gentoo-init.lisp")
+EOF
+	fi
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${D}/usr" LIB_DIR="/usr/$(get_libdir)" DOC_DIR="${D}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# rm empty directories lest paludis complain about this
+	find "${D}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dohtml -r doc/manual/
+		doinfo doc/manual/*.info*
+		dohtml -r doc/internals/sbcl-internals
+		doinfo doc/internals/sbcl-internals.info
+		docinto internals-notes && dodoc doc/internals-notes/*
+	else
+		rm -Rv "${D}/usr/share/doc/${PF}"
+	fi
+
+	dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE TLA TODO
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${D}/usr/$(get_libdir)/sbcl/"
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
@ 2013-04-05  0:31 Stelian Ionescu
  0 siblings, 0 replies; 13+ messages in thread
From: Stelian Ionescu @ 2013-04-05  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     e7da6f15445267f0b87c5a9b2c0faead71f15257
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Fri Apr  5 00:31:37 2013 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Fri Apr  5 00:31:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=e7da6f15

dev-lisp/sbcl: bump to version 1.1.6

---
 dev-lisp/sbcl/files/1.1.6-fix-svref.patch          |   59 ++++++++++++++++++++
 .../{sbcl-1.1.5-r2.ebuild => sbcl-1.1.6.ebuild}    |    1 +
 2 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/dev-lisp/sbcl/files/1.1.6-fix-svref.patch b/dev-lisp/sbcl/files/1.1.6-fix-svref.patch
new file mode 100644
index 0000000..95861ad
--- /dev/null
+++ b/dev-lisp/sbcl/files/1.1.6-fix-svref.patch
@@ -0,0 +1,59 @@
+commit 66ee499237be5778b44b0d7b2de396562137228e
+Author: Paul Khuong <pvk@pvk.ca>
+Date:   Sat Mar 30 19:22:46 2013 +0100
+
+    Fix a compilation failure on svref of a symbol macro
+    
+     Introduced in 0892423b (faster SVREF and (SETF SVREF) compilation)
+    
+     Thanks to James M. Lawrence for the quick report, with a reduced
+     test case.
+
+diff --git a/NEWS b/NEWS
+index 0774be8..0357268 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,4 +1,8 @@
+ ;;;; -*- coding: utf-8; fill-column: 78 -*-
++changes relative to sbcl-1.1.6
++  * bug fix: svref/(setf svref) on symbol macros don't crash the compiler
++    anymore. (Minimal test case provided by James M. Lawrence on sbcl-devel)
++
+ changes in sbcl-1.1.6 relative to sbcl-1.1.5:
+   * enhancement: the continuable error when defknown-ing over extant 
+     fndb entries can be ignored by passing :overwrite-fndb-silently t
+diff --git a/src/compiler/array-tran.lisp b/src/compiler/array-tran.lisp
+index a595e63..d70cdb5 100644
+--- a/src/compiler/array-tran.lisp
++++ b/src/compiler/array-tran.lisp
+@@ -1023,7 +1023,7 @@
+ (define-source-transform svref (vector index)
+   (let ((elt-type (or (when (symbolp vector)
+                         (let ((var (lexenv-find vector vars)))
+-                          (when var
++                          (when (lambda-var-p var)
+                             (type-specifier
+                              (array-type-declared-element-type (lambda-var-type var))))))
+                       t)))
+@@ -1036,7 +1036,7 @@
+ (define-source-transform %svset (vector index value)
+   (let ((elt-type (or (when (symbolp vector)
+                         (let ((var (lexenv-find vector vars)))
+-                          (when var
++                          (when (lambda-var-p var)
+                             (type-specifier
+                              (array-type-declared-element-type (lambda-var-type var))))))
+                       t)))
+diff --git a/tests/compiler.pure.lisp b/tests/compiler.pure.lisp
+index 833c5ee..1a4fc7d 100644
+--- a/tests/compiler.pure.lisp
++++ b/tests/compiler.pure.lisp
+@@ -4378,3 +4378,8 @@
+ (with-test (:name :second-open-coded)
+   (let ((fun (compile nil `(lambda (x) (second x)))))
+     (assert (not (ctu:find-named-callees fun)))))
++
++(with-test (:name :svref-of-symbol-macro)
++  (compile nil `(lambda (x)
++                  (symbol-macrolet ((sv x))
++                    (values (svref sv 0) (setf (svref sv 0) 99))))))

diff --git a/dev-lisp/sbcl/sbcl-1.1.5-r2.ebuild b/dev-lisp/sbcl/sbcl-1.1.6.ebuild
similarity index 99%
rename from dev-lisp/sbcl/sbcl-1.1.5-r2.ebuild
rename to dev-lisp/sbcl/sbcl-1.1.6.ebuild
index 42662a1..3ad10f0 100644
--- a/dev-lisp/sbcl/sbcl-1.1.5-r2.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.1.6.ebuild
@@ -78,6 +78,7 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/gentoo-fix_install_man.patch
 	epatch "${FILESDIR}"/gentoo-fix_linux-os-c.patch
+	epatch "${FILESDIR}"/1.1.6-fix-svref.patch
 
 	# To make the hardened compiler NOT compile with -fPIE -pie
 	if gcc-specs-pie ; then


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
@ 2014-12-17 16:17 José María Alonso
  0 siblings, 0 replies; 13+ messages in thread
From: José María Alonso @ 2014-12-17 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     94b31620a546137d41747b51d968ec617e122173
Author:     Chema Alonso <nimiux <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 17 16:19:39 2014 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Wed Dec 17 16:19:39 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=94b31620

dev-lisp/sbcl: bump to version 1.2.6

---
 dev-lisp/sbcl/files/bsd-sockets-test-1.2.patch     |  24 +++
 dev-lisp/sbcl/files/concurrency-test-1.2.6.patch   |  24 +++
 ...7-gentoo-fix_nopie_for_hardened_toolchain.patch |  22 +++
 dev-lisp/sbcl/metadata.xml                         |   1 +
 dev-lisp/sbcl/sbcl-1.2.6.ebuild                    | 206 +++++++++++++++++++++
 5 files changed, 277 insertions(+)

diff --git a/dev-lisp/sbcl/files/bsd-sockets-test-1.2.patch b/dev-lisp/sbcl/files/bsd-sockets-test-1.2.patch
new file mode 100644
index 0000000..7a7b12b
--- /dev/null
+++ b/dev-lisp/sbcl/files/bsd-sockets-test-1.2.patch
@@ -0,0 +1,24 @@
+diff -r -U1 sbcl-1.2.2.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-1.2.2/contrib/sb-bsd-sockets/tests.lisp
+--- sbcl-1.2.2.orig/contrib/sb-bsd-sockets/tests.lisp	2014-07-28 17:15:05.000000000 +0700
++++ sbcl-1.2.2/contrib/sb-bsd-sockets/tests.lisp	2014-08-01 19:48:30.011931081 +0700
+@@ -31,11 +31,11 @@
+ ;;; for unknown protocols...
+-#-(and freebsd sb-thread)
+-#-(and dragonfly sb-thread)
+-(deftest get-protocol-by-name/error
+-  (handler-case (get-protocol-by-name "nonexistent-protocol")
+-    (unknown-protocol ()
+-      t)
+-    (:no-error ()
+-      nil))
+-  t)
++;#-(and freebsd sb-thread)
++;#-(and dragonfly sb-thread)
++;(deftest get-protocol-by-name/error
++;  (handler-case (get-protocol-by-name "nonexistent-protocol")
++;    (unknown-protocol ()
++;      t)
++;    (:no-error ()
++;      nil))
++;  t)
+ 

diff --git a/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch b/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch
new file mode 100644
index 0000000..b85fc16
--- /dev/null
+++ b/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch
@@ -0,0 +1,24 @@
+diff -Nuar a/contrib/sb-concurrency/tests/test-frlock.lisp b/contrib/sb-concurrency/tests/test-frlock.lisp
+--- a/contrib/sb-concurrency/tests/test-frlock.lisp	2014-11-29 19:56:58.000000000 +0100
++++ b/contrib/sb-concurrency/tests/test-frlock.lisp	2014-12-16 23:52:18.569947139 +0100
+@@ -22,9 +22,9 @@
+   #+openbsd 0.01
+   #-openbsd 0.0001)
+ 
+-(defun test-frlocks (&key (reader-count 100) (read-count 1000000)
++(defun test-frlocks (&key (reader-count 50) (read-count 500000)
+                           (outer-read-pause 0) (inner-read-pause 0)
+-                          (writer-count 10) (write-count (/ 1 *minimum-sleep*))
++                          (writer-count 10) (write-count 5000)
+                           (outer-write-pause *minimum-sleep*) (inner-write-pause 0))
+     (let ((rw (make-frlock))
+           (a 0)
+@@ -87,7 +87,7 @@
+ #+sb-thread
+ (deftest* (frlock.1 :fails-on :win32)
+     (handler-case
+-        (sb-ext:with-timeout 60 (test-frlocks))
++        (sb-ext:with-timeout 240 (test-frlocks))
+       (sb-ext:timeout (c)
+         (error "~A" c)))
+   nil

diff --git a/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch b/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
new file mode 100644
index 0000000..bf03ada
--- /dev/null
+++ b/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
@@ -0,0 +1,22 @@
+--- sbcl-1.1.17-orig/src/runtime/Config.x86-linux	2014-03-31 03:14:22.000000000 +1100
++++ sbcl-1.1.17/src/runtime/Config.x86-linux	2014-04-28 15:34:59.822482441 +1000
+@@ -27,7 +27,7 @@
+ # (You *are* encouraged to design and implement a coherent stable
+ # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
+ # working on one and it would be a nice thing to have.)
+-LINKFLAGS += -Wl,--export-dynamic -m32
++LINKFLAGS += -Wl,--export-dynamic -m32 -nopie
+ OS_LIBS = -ldl
+ 
+ ifdef LISP_FEATURE_LARGEFILE
+--- sbcl-1.1.17-orig/src/runtime/Config.x86-64-linux	2014-03-31 03:14:22.000000000 +1100
++++ sbcl-1.1.17/src/runtime/Config.x86-64-linux	2014-04-28 15:35:22.364623003 +1000
+@@ -27,7 +27,7 @@
+ # (You *are* encouraged to design and implement a coherent stable
+ # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
+ # working on one and it would be a nice thing to have.)
+-LINKFLAGS += -Wl,--export-dynamic
++LINKFLAGS += -Wl,--export-dynamic -nopie
+ OS_LIBS = -ldl
+ 
+ ifdef LISP_FEATURE_LARGEFILE

diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml
index 1fe9d18..d2fa3df 100644
--- a/dev-lisp/sbcl/metadata.xml
+++ b/dev-lisp/sbcl/metadata.xml
@@ -22,5 +22,6 @@ SBCL 0.8.17 and later support Unicode.
 <use>
 <flag name='cobalt'>mips only: use mipsel binary instead of mips big endian
 binary to bootstrap</flag>
+<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-lisp/sbcl/sbcl-1.2.6.ebuild b/dev-lisp/sbcl/sbcl-1.2.6.ebuild
new file mode 100644
index 0000000..6210100
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.2.6.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.0.58
+BV_AMD64=1.2.6
+BV_PPC=1.0.28
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/paxctl sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		 elibc_glibc? ( >=sys-libs/glibc-2.6 )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-linux sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/gentoo-fix_install_man.patch
+	# bug #468482
+	epatch "${FILESDIR}/concurrency-test-${PV}.patch"
+	# bug #486552
+	epatch "${FILESDIR}"/bsd-sockets-test-1.2.patch
+
+	# To make the hardened compiler NOT compile with -fPIE -pie
+	if gcc-specs-pie ; then
+		einfo "Disabling PIE..."
+		epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
+	fi
+
+	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
+
+	if host-is-pax ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug 174702
+	# set HOME for paludis
+	env - HOME="${T}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${D}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${D}/usr" LIB_DIR="/usr/$(get_libdir)" DOC_DIR="${D}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# rm empty directories lest paludis complain about this
+	find "${D}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dohtml -r doc/manual/
+		doinfo doc/manual/*.info*
+		dohtml -r doc/internals/sbcl-internals
+		doinfo doc/internals/sbcl-internals.info
+		docinto internals-notes && dodoc doc/internals-notes/*
+	else
+		rm -Rv "${D}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${D}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
@ 2017-04-04 18:05 José María Alonso
  0 siblings, 0 replies; 13+ messages in thread
From: José María Alonso @ 2017-04-04 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     a64ff38aaa36378dc63c18536d6440a70b5ed551
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  4 18:06:18 2017 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Tue Apr  4 18:06:18 2017 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=a64ff38a

dev-lisp/sbcl: Syncs with last version in the tree

 dev-lisp/sbcl/files/bsd-sockets-test-1.3.12.patch  | 346 +++++++++++++++++++++
 dev-lisp/sbcl/files/concurrency-test-1.3.15.patch  |  17 +
 dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch     |  40 +++
 dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch      |  12 +
 .../sbcl/files/sbcl-1.2.13-verbose-build.patch     |  25 ++
 ...5-gentoo-fix_nopie_for_hardened_toolchain.patch |  19 ++
 dev-lisp/sbcl/sbcl-1.3.15.ebuild                   | 236 ++++++++++++++
 7 files changed, 695 insertions(+)

diff --git a/dev-lisp/sbcl/files/bsd-sockets-test-1.3.12.patch b/dev-lisp/sbcl/files/bsd-sockets-test-1.3.12.patch
new file mode 100644
index 00000000..9a4eb151
--- /dev/null
+++ b/dev-lisp/sbcl/files/bsd-sockets-test-1.3.12.patch
@@ -0,0 +1,346 @@
+diff -r -U2 sbcl-1.3.12.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-1.3.12/contrib/sb-bsd-sockets/tests.lisp
+--- sbcl-1.3.12.orig/contrib/sb-bsd-sockets/tests.lisp	2016-11-30 04:07:35.000000000 +0700
++++ sbcl-1.3.12/contrib/sb-bsd-sockets/tests.lisp	2016-12-10 15:56:14.727887603 +0700
+@@ -38,11 +38,11 @@
+ #-(and freebsd sb-thread)
+ #-(and dragonfly sb-thread)
+-(deftest get-protocol-by-name/error
+-  (handler-case (get-protocol-by-name "nonexistent-protocol")
+-    (unknown-protocol ()
+-      t)
+-    (:no-error ()
+-      nil))
+-  t)
++;(deftest get-protocol-by-name/error
++;  (handler-case (get-protocol-by-name "nonexistent-protocol")
++;    (unknown-protocol ()
++;      t)
++;    (:no-error ()
++;      nil))
++;  t)
+ 
+ (deftest make-inet-socket.smoke
+@@ -92,19 +92,19 @@
+   t)
+ 
+-#-win32
+-(deftest make-inet6-socket.smoke
+-  (handler-case
+-      (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
+-        (> (socket-file-descriptor s) 1))
+-    ((or address-family-not-supported protocol-not-supported-error) () t))
+-  t)
+-
+-#-win32
+-(deftest make-inet6-socket.keyword
+-  (handler-case
+-      (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
+-        (> (socket-file-descriptor s) 1))
+-    ((or address-family-not-supported protocol-not-supported-error) () t))
+-  t)
++;#-win32
++;(deftest make-inet6-socket.smoke
++;  (handler-case
++;      (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
++;        (> (socket-file-descriptor s) 1))
++;    ((or address-family-not-supported protocol-not-supported-error) () t))
++;  t)
++
++;#-win32
++;(deftest make-inet6-socket.keyword
++;  (handler-case
++;      (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
++;        (> (socket-file-descriptor s) 1))
++;    ((or address-family-not-supported protocol-not-supported-error) () t))
++;  t)
+ 
+ (deftest* (non-block-socket)
+@@ -114,52 +114,52 @@
+   t)
+ 
+-(deftest inet-socket-bind
+-  (let* ((tcp (get-protocol-by-name "tcp"))
+-         (address (make-inet-address "127.0.0.1"))
+-         (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
+-         (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
+-    (unwind-protect
+-         ;; Given the functions we've got so far, if you can think of a
+-         ;; better way to make sure the bind succeeded than trying it
+-         ;; twice, let me know
+-         (progn
+-           (socket-bind s1 address 0)
+-           (handler-case
+-               (let ((port (nth-value 1 (socket-name s1))))
+-                 (socket-bind s2 address port)
+-                 nil)
+-             (address-in-use-error () t)))
+-      (socket-close s1)
+-      (socket-close s2)))
+-  t)
+-
+-#-win32
+-(deftest inet6-socket-bind
+-  (handler-case
+-      (let* ((tcp (get-protocol-by-name "tcp"))
+-             (address (make-inet6-address "::1"))
+-             (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
+-             (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
+-        (unwind-protect
+-             ;; Given the functions we've got so far, if you can think of a
+-             ;; better way to make sure the bind succeeded than trying it
+-             ;; twice, let me know
+-             (handler-case
+-                 (socket-bind s1 address 0)
+-               (socket-error ()
+-                 ;; This may mean no IPv6 support, can't fail a test
+-                 ;; because of that (address-family-not-supported doesn't catch that)
+-                 t)
+-               (:no-error (x)
+-                 (declare (ignore x))
+-                 (handler-case
+-                     (let ((port (nth-value 1 (socket-name s1))))
+-                       (socket-bind s2 address port)
+-                       nil)
+-                   (address-in-use-error () t))))
+-          (socket-close s1)
+-          (socket-close s2)))
+-    ((or address-family-not-supported protocol-not-supported-error) () t))
+-  t)
++;(deftest inet-socket-bind
++;  (let* ((tcp (get-protocol-by-name "tcp"))
++;         (address (make-inet-address "127.0.0.1"))
++;         (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
++;         (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
++;    (unwind-protect
++;         ;; Given the functions we've got so far, if you can think of a
++;         ;; better way to make sure the bind succeeded than trying it
++;         ;; twice, let me know
++;         (progn
++;           (socket-bind s1 address 0)
++;           (handler-case
++;               (let ((port (nth-value 1 (socket-name s1))))
++;                 (socket-bind s2 address port)
++;                 nil)
++;             (address-in-use-error () t)))
++;      (socket-close s1)
++;      (socket-close s2)))
++;  t)
++
++;#-win32
++;(deftest inet6-socket-bind
++;  (handler-case
++;      (let* ((tcp (get-protocol-by-name "tcp"))
++;             (address (make-inet6-address "::1"))
++;             (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
++;             (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
++;        (unwind-protect;
++;             ;; Given the functions we've got so far, if you can think of a
++;             ;; better way to make sure the bind succeeded than trying it
++;             ;; twice, let me know
++;             (handler-case
++;                 (socket-bind s1 address 0)
++;               (socket-error ()
++;                 ;; This may mean no IPv6 support, can't fail a test
++;                 ;; because of that (address-family-not-supported doesn't catch that)
++;                 t)
++;               (:no-error (x)
++;                 (declare (ignore x))
++;                 (handler-case
++;                     (let ((port (nth-value 1 (socket-name s1))))
++;                       (socket-bind s2 address port)
++;                       nil)
++;                   (address-in-use-error () t))))
++;          (socket-close s1)
++;          (socket-close s2)))
++;    ((or address-family-not-supported protocol-not-supported-error) () t))
++;  t)
+ 
+ (deftest* (simple-sockopt-test)
+@@ -228,35 +228,35 @@
+ ;;; the message ended up
+ 
+-#-win32
+-(deftest simple-local-client
+-    (progn
+-      ;; SunOS (Solaris) and Darwin systems don't have a socket at
+-      ;; /dev/log.  We might also be building in a chroot or
+-      ;; something, so don't fail this test just because the file is
+-      ;; unavailable, or if it's a symlink to some weird character
+-      ;; device.
+-      (when (block nil
+-              (handler-bind ((sb-posix:syscall-error
+-                              (lambda (e)
+-                                (declare (ignore e))
+-                                (return nil))))
+-                (sb-posix:s-issock
+-                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
+-        (let ((s (make-instance 'local-socket :type :datagram)))
+-          (format t "Connecting ~A... " s)
+-          (finish-output)
+-          (handler-case
+-              (socket-connect s "/dev/log")
+-            (sb-bsd-sockets::socket-error ()
+-              (setq s (make-instance 'local-socket :type :stream))
+-              (format t "failed~%Retrying with ~A... " s)
+-              (finish-output)
+-              (socket-connect s "/dev/log")))
+-          (format t "ok.~%")
+-          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
+-            (format stream
+-                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
+-      t)
+-  t)
++;#-win32
++;(deftest simple-local-client
++;    (progn
++;      ;; SunOS (Solaris) and Darwin systems don't have a socket at
++;      ;; /dev/log.  We might also be building in a chroot or
++;      ;; something, so don't fail this test just because the file is
++;      ;; unavailable, or if it's a symlink to some weird character
++;      ;; device.
++;      (when (block nil
++;              (handler-bind ((sb-posix:syscall-error
++;                              (lambda (e)
++;                                (declare (ignore e))
++;                                (return nil))))
++;                (sb-posix:s-issock
++;                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
++;        (let ((s (make-instance 'local-socket :type :datagram)))
++;          (format t "Connecting ~A... " s)
++;          (finish-output)
++;          (handler-case
++;              (socket-connect s "/dev/log")
++;            (sb-bsd-sockets::socket-error ()
++;              (setq s (make-instance 'local-socket :type :stream))
++;              (format t "failed~%Retrying with ~A... " s)
++;              (finish-output)
++;              (socket-connect s "/dev/log")))
++;          (format t "ok.~%")
++;          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
++;            (format stream
++;                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
++;      t)
++;  t)
+ 
+ 
+@@ -373,58 +373,58 @@
+                len address port (subseq buf 0 (min 10 len)))))))
+ 
+-#+sb-thread
+-(deftest interrupt-io
+-    (let (result)
+-      (labels
+-          ((client (port)
+-             (setf result
+-                   (let ((s (make-instance 'inet-socket
+-                                           :type :stream
+-                                           :protocol :tcp)))
+-                     (socket-connect s #(127 0 0 1) port)
+-                     (let ((stream (socket-make-stream s
+-                                                       :input t
+-                                                       :output t
+-                                                       :buffering :none)))
+-                       (handler-case
+-                           (prog1
+-                               (catch 'stop
+-                                 (progn
+-                                   (read-char stream)
+-                                   (sleep 0.1)
+-                                   (sleep 0.1)
+-                                   (sleep 0.1)))
+-                             (close stream))
+-                         (error (c)
+-                           c))))))
+-           (server ()
+-             (let ((s (make-instance 'inet-socket
+-                                     :type :stream
+-                                     :protocol :tcp)))
+-               (setf (sockopt-reuse-address s) t)
+-               (socket-bind s (make-inet-address "127.0.0.1") 0)
+-               (socket-listen s 5)
+-               (multiple-value-bind (* port)
+-                   (socket-name s)
+-                 (let* ((client (sb-thread:make-thread
+-                                 (lambda () (client port))))
+-                        (r (socket-accept s))
+-                        (stream (socket-make-stream r
+-                                                    :input t
+-                                                    :output t
+-                                                    :buffering :none))
+-                        (ok :ok))
+-                   (socket-close s)
+-                   (sleep 5)
+-                   (sb-thread:interrupt-thread client
+-                                               (lambda () (throw 'stop ok)))
+-                   (sleep 5)
+-                   (setf ok :not-ok)
+-                   (write-char #\x stream)
+-                   (close stream)
+-                   (socket-close r))))))
+-        (server))
+-      result)
+-  :ok)
++;#+sb-thread
++;(deftest interrupt-io
++;    (let (result)
++;      (labels
++;          ((client (port)
++;             (setf result
++;                   (let ((s (make-instance 'inet-socket
++;                                           :type :stream
++;                                           :protocol :tcp)))
++;                     (socket-connect s #(127 0 0 1) port)
++;                     (let ((stream (socket-make-stream s
++;                                                       :input t
++;                                                       :output t
++;                                                       :buffering :none)))
++;                       (handler-case
++;                           (prog1
++;                               (catch 'stop
++;                                 (progn
++;                                   (read-char stream)
++;                                   (sleep 0.1)
++;                                   (sleep 0.1)
++;                                   (sleep 0.1)))
++;                             (close stream))
++;                         (error (c)
++;                           c))))))
++;           (server ()
++;             (let ((s (make-instance 'inet-socket
++;                                     :type :stream
++;                                     :protocol :tcp)))
++;               (setf (sockopt-reuse-address s) t)
++;               (socket-bind s (make-inet-address "127.0.0.1") 0)
++;               (socket-listen s 5)
++;               (multiple-value-bind (* port)
++;                   (socket-name s)
++;                 (let* ((client (sb-thread:make-thread
++;                                 (lambda () (client port))))
++;                        (r (socket-accept s))
++;                        (stream (socket-make-stream r
++;                                                    :input t
++;                                                    :output t
++;                                                    :buffering :none))
++;                        (ok :ok))
++;                   (socket-close s)
++;                   (sleep 5)
++;                   (sb-thread:interrupt-thread client
++;                                               (lambda () (throw 'stop ok)))
++;                   (sleep 5)
++;                   (setf ok :not-ok)
++;                   (write-char #\x stream)
++;                   (close stream)
++;                   (socket-close r))))))
++;        (server))
++;      result)
++;  :ok)
+ 
+ (defmacro with-client-and-server ((server-socket-var client-socket-var) &body body)
+@@ -485,4 +485,5 @@
+               client server (unsigned-byte 8) ,direction)))))
+ 
+-  (define-shutdown-tests :output)
+-  (define-shutdown-tests :io))
++;  (define-shutdown-tests :output)
++;  (define-shutdown-tests :io))
++)

diff --git a/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch b/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch
new file mode 100644
index 00000000..53b5bea0
--- /dev/null
+++ b/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch
@@ -0,0 +1,17 @@
+diff -r -U2 sbcl-1.3.15.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-1.3.15/contrib/sb-concurrency/tests/test-frlock.lisp
+--- sbcl-1.3.15.orig/contrib/sb-concurrency/tests/test-frlock.lisp	2017-02-28 20:51:29.000000000 +0100
++++ sbcl-1.3.15/contrib/sb-concurrency/tests/test-frlock.lisp	2017-03-02 18:15:41.225284441 +0100
+@@ -25,5 +25,5 @@
+ (defun test-frlocks (&key (reader-count 100) (read-count 1000000)
+                           (outer-read-pause 0) (inner-read-pause 0)
+-                          (writer-count 10) (write-count (/ 1 *minimum-sleep*))
++                          (writer-count 10) (write-count 5000)
+                           (outer-write-pause *minimum-sleep*) (inner-write-pause 0))
+     (let ((rw (make-frlock))
+@@ -88,5 +88,5 @@
+ (deftest* (frlock.1)
+     (handler-case
+-        (sb-ext:with-timeout 10
++        (sb-ext:with-timeout 240
+           (test-frlocks #+win32 :outer-write-pause #+win32 t ))
+       (sb-ext:timeout (c)

diff --git a/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch b/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch
new file mode 100644
index 00000000..517208a7
--- /dev/null
+++ b/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch
@@ -0,0 +1,40 @@
+diff -r -U1 sbcl-1.2.15.orig/contrib/sb-posix/posix-tests.lisp sbcl-1.2.15/contrib/sb-posix/posix-tests.lisp
+--- sbcl-1.2.15.orig/contrib/sb-posix/posix-tests.lisp	2015-08-31 00:59:03.000000000 +0600
++++ sbcl-1.2.15/contrib/sb-posix/posix-tests.lisp	2015-09-22 10:19:20.000000000 +0600
+@@ -169,19 +169,19 @@
+ 
+-(deftest rmdir.error.3
+-  (handler-case
+-      (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir"))
+-    (sb-posix:syscall-error (c)
+-      (typep
+-       (sb-posix:syscall-errno c)
+-       '(member
+-         #+(or darwin openbsd)
+-         #.sb-posix:eisdir
+-         #+win32
+-         #.sb-posix::eacces
+-         #+win32
+-         #.sb-posix::enotempty
+-         #+sunos
+-         #.sb-posix::einval
+-         #-(or darwin openbsd win32 sunos)
+-         #.sb-posix::ebusy)))) t)
++;(deftest rmdir.error.3
++;  (handler-case
++;      (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir"))
++;    (sb-posix:syscall-error (c)
++;      (typep
++;       (sb-posix:syscall-errno c)
++;       '(member
++;         #+(or darwin openbsd)
++;         #.sb-posix:eisdir
++;         #+win32
++;         #.sb-posix::eacces
++;         #+win32
++;         #.sb-posix::enotempty
++;         #+sunos
++;         #.sb-posix::einval
++;         #-(or darwin openbsd win32 sunos)
++;         #.sb-posix::ebusy)))) t)
+ 

diff --git a/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch b/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch
new file mode 100644
index 00000000..850fd5d9
--- /dev/null
+++ b/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch
@@ -0,0 +1,12 @@
+diff -r -U2 sbcl-1.2.11.orig/src/runtime/Config.x86-sunos sbcl-1.2.11/src/runtime/Config.x86-sunos
+--- sbcl-1.2.11.orig/src/runtime/Config.x86-sunos	2015-04-27 20:56:50.000000000 +0600
++++ sbcl-1.2.11/src/runtime/Config.x86-sunos	2015-04-28 22:38:01.569103626 +0600
+@@ -12,6 +12,6 @@
+ CC=gcc
+ CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
+-NM = nm -xgp
+-GREP = ggrep
++NM = nm -t x -p
++GREP = grep
+ 
+ ASSEM_SRC = x86-assem.S ldso-stubs.S

diff --git a/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch b/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch
new file mode 100644
index 00000000..ade4f086
--- /dev/null
+++ b/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch
@@ -0,0 +1,25 @@
+diff -r -U2 sbcl-1.2.13.orig/make.sh sbcl-1.2.13/make.sh
+--- sbcl-1.2.13.orig/make.sh	2015-06-29 01:24:03.000000000 +0600
++++ sbcl-1.2.13/make.sh	2015-06-29 15:53:04.430927942 +0600
+@@ -25,5 +25,5 @@
+ # any --xc-host parameter should be suitable for the host machine
+ # instead of the target.
+-sh make-config.sh "$@" || exit $?
++sh -x make-config.sh "$@" || exit $?
+ 
+ . output/prefix.def
+@@ -70,9 +70,9 @@
+ # and the make-target-*.sh scripts will take care of transferring the
+ # necessary files.
+-time sh make-host-1.sh
+-time sh make-target-1.sh
+-time sh make-host-2.sh
+-time sh make-target-2.sh
+-time sh make-target-contrib.sh
++time sh -x make-host-1.sh
++time sh -x make-target-1.sh
++time sh -x make-host-2.sh
++time sh -x make-target-2.sh
++time sh -x make-target-contrib.sh
+ 
+ NCONTRIBS=`find contrib -name Makefile -print | wc -l`

diff --git a/dev-lisp/sbcl/files/sbcl-1.3.15-gentoo-fix_nopie_for_hardened_toolchain.patch b/dev-lisp/sbcl/files/sbcl-1.3.15-gentoo-fix_nopie_for_hardened_toolchain.patch
new file mode 100644
index 00000000..a3f93309
--- /dev/null
+++ b/dev-lisp/sbcl/files/sbcl-1.3.15-gentoo-fix_nopie_for_hardened_toolchain.patch
@@ -0,0 +1,19 @@
+diff -U3 -r sbcl-1.3.15.orig/src/runtime/GNUmakefile sbcl-1.3.15/src/runtime/GNUmakefile
+--- sbcl-1.3.15.orig/src/runtime/GNUmakefile	2017-02-28 20:51:29.000000000 +0100
++++ sbcl-1.3.15/src/runtime/GNUmakefile	2017-03-02 18:22:13.959257937 +0100
+@@ -46,13 +46,13 @@
+ include Config
+ 
+ # Disable PIE when possible
+-ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e no-pie),)
++ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]no-pie'),)
+ CFLAGS += -fno-pie
+ LINKFLAGS += -no-pie
+ LDFLAGS += -no-pie
+ __LDFLAGS__ += -no-pie
+ endif
+-ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e nopie),)
++ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]nopie'),)
+ CFLAGS += -fno-pie
+ LINKFLAGS += -nopie
+ LDFLAGS += -nopie

diff --git a/dev-lisp/sbcl/sbcl-1.3.15.ebuild b/dev-lisp/sbcl/sbcl-1.3.15.ebuild
new file mode 100644
index 00000000..51f1378d
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.3.15.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.2.7
+BV_AMD64=1.3.15
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.3.12
+BV_ARM64=1.3.11
+BV_PPC_MACOS=1.0.47
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_SPARC_SOLARIS=1.0.23
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/gentoo-fix_install_man.patch
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-1.3.15.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/bsd-sockets-test-1.3.12.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+	# bug #599902, #607302, #583930
+	eapply "${FILESDIR}"/${PN}-1.3.15-gentoo-fix_nopie_for_hardened_toolchain.patch
+
+	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
+
+	eapply_user
+
+	# bug #526194
+	sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
+		-e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug 174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
@ 2017-04-04 18:39 José María Alonso
  0 siblings, 0 replies; 13+ messages in thread
From: José María Alonso @ 2017-04-04 18:39 UTC (permalink / raw
  To: gentoo-commits

commit:     4d6252c4113397492af97da0ff6ad7c1a48df6db
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  4 18:40:07 2017 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Tue Apr  4 18:40:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=4d6252c4

dev-lisp/sbcl: Bumps version to 1.3.16

 .../files/sbcl-1.3.16-gentoo-fix_install_man.patch |  12 ++
 dev-lisp/sbcl/sbcl-1.3.16.ebuild                   | 234 +++++++++++++++++++++
 2 files changed, 246 insertions(+)

diff --git a/dev-lisp/sbcl/files/sbcl-1.3.16-gentoo-fix_install_man.patch b/dev-lisp/sbcl/files/sbcl-1.3.16-gentoo-fix_install_man.patch
new file mode 100644
index 00000000..5e01b331
--- /dev/null
+++ b/dev-lisp/sbcl/files/sbcl-1.3.16-gentoo-fix_install_man.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/install.sh b/install.sh
+--- a/install.sh	2017-03-27 11:57:34.000000000 +0200
++++ b/install.sh	2017-04-04 20:21:25.510085555 +0200
+@@ -110,7 +110,7 @@
+ CP="cp -f"
+ 
+ # man
+-$CP doc/sbcl.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl.1"
++$CP doc/sbcl-asdf-install.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl-asdf-install.1"
+ 
+ # info
+ for info in doc/manual/*.info

diff --git a/dev-lisp/sbcl/sbcl-1.3.16.ebuild b/dev-lisp/sbcl/sbcl-1.3.16.ebuild
new file mode 100644
index 00000000..57ea1430
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.3.16.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.2.7
+BV_AMD64=1.3.16
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.3.12
+BV_ARM64=1.3.16
+BV_PPC_MACOS=1.0.47
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_SPARC_SOLARIS=1.0.23
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-gentoo-fix_install_man.patch
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-1.3.15.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/bsd-sockets-test-1.3.12.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
+
+	eapply_user
+
+	# bug #526194
+	sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
+		-e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug 174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
@ 2017-07-02 16:11 José María Alonso
  0 siblings, 0 replies; 13+ messages in thread
From: José María Alonso @ 2017-07-02 16:11 UTC (permalink / raw
  To: gentoo-commits

commit:     c6505d6f44e9aa904eeadc9beb6d94f51aeae7b7
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 16:11:41 2017 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 16:11:41 2017 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=c6505d6f

dev-lisp/sbcl: Bumps version to 1.3.19

 .../sbcl/files/sbcl-1.3.19-bsd-sockets-test.patch  | 363 +++++++++++++++++++++
 dev-lisp/sbcl/sbcl-1.3.19.ebuild                   | 234 +++++++++++++
 2 files changed, 597 insertions(+)

diff --git a/dev-lisp/sbcl/files/sbcl-1.3.19-bsd-sockets-test.patch b/dev-lisp/sbcl/files/sbcl-1.3.19-bsd-sockets-test.patch
new file mode 100644
index 00000000..c5a16ae0
--- /dev/null
+++ b/dev-lisp/sbcl/files/sbcl-1.3.19-bsd-sockets-test.patch
@@ -0,0 +1,363 @@
+diff -Nuar a/contrib/sb-bsd-sockets/tests.lisp b/contrib/sb-bsd-sockets/tests.lisp
+--- a/contrib/sb-bsd-sockets/tests.lisp	2017-06-28 12:51:14.000000000 +0200
++++ b/contrib/sb-bsd-sockets/tests.lisp	2017-07-02 17:18:23.862316798 +0200
+@@ -35,15 +35,15 @@
+ ;;; See https://bugs.launchpad.net/sbcl/+bug/659857
+ ;;; Apparently getprotobyname_r on FreeBSD says -1 and EINTR
+ ;;; for unknown protocols...
+-#-(and freebsd sb-thread)
+-#-(and dragonfly sb-thread)
+-(deftest get-protocol-by-name/error
+-  (handler-case (get-protocol-by-name "nonexistent-protocol")
+-    (unknown-protocol ()
+-      t)
+-    (:no-error ()
+-      nil))
+-  t)
++;#-(and freebsd sb-thread)
++;#-(and dragonfly sb-thread)
++;(deftest get-protocol-by-name/error
++;  (handler-case (get-protocol-by-name "nonexistent-protocol")
++;    (unknown-protocol ()
++;      t)
++;    (:no-error ()
++;      nil))
++;  t)
+ 
+ (when (handler-case (make-instance 'inet-socket
+                                    :type :stream
+@@ -102,21 +102,21 @@
+       (:no-error nil))
+   t)
+ 
+-#-win32
+-(deftest make-inet6-socket.smoke
+-  (handler-case
+-      (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
+-        (> (socket-file-descriptor s) 1))
+-    ((or address-family-not-supported protocol-not-supported-error) () t))
+-  t)
+-
+-#-win32
+-(deftest make-inet6-socket.keyword
+-  (handler-case
+-      (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
+-        (> (socket-file-descriptor s) 1))
+-    ((or address-family-not-supported protocol-not-supported-error) () t))
+-  t)
++;#-win32
++;(deftest make-inet6-socket.smoke
++;  (handler-case
++;      (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
++;        (> (socket-file-descriptor s) 1))
++;    ((or address-family-not-supported protocol-not-supported-error) () t))
++;  t)
++
++;#-win32
++;(deftest make-inet6-socket.keyword
++;  (handler-case
++;      (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
++;        (> (socket-file-descriptor s) 1))
++;    ((or address-family-not-supported protocol-not-supported-error) () t))
++;  t)
+ 
+ #+ipv4-support
+ (deftest* (non-block-socket)
+@@ -125,55 +125,55 @@
+     (non-blocking-mode s))
+   t)
+ 
+-#+ipv4-support
+-(deftest inet-socket-bind
+-  (let* ((tcp (get-protocol-by-name "tcp"))
+-         (address (make-inet-address "127.0.0.1"))
+-         (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
+-         (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
+-    (unwind-protect
+-         ;; Given the functions we've got so far, if you can think of a
+-         ;; better way to make sure the bind succeeded than trying it
+-         ;; twice, let me know
+-         (progn
+-           (socket-bind s1 address 0)
+-           (handler-case
+-               (let ((port (nth-value 1 (socket-name s1))))
+-                 (socket-bind s2 address port)
+-                 nil)
+-             (address-in-use-error () t)))
+-      (socket-close s1)
+-      (socket-close s2)))
+-  t)
+-
+-#-win32
+-(deftest inet6-socket-bind
+-  (handler-case
+-      (let* ((tcp (get-protocol-by-name "tcp"))
+-             (address (make-inet6-address "::1"))
+-             (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
+-             (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
+-        (unwind-protect
+-             ;; Given the functions we've got so far, if you can think of a
+-             ;; better way to make sure the bind succeeded than trying it
+-             ;; twice, let me know
+-             (handler-case
+-                 (socket-bind s1 address 0)
+-               (socket-error ()
+-                 ;; This may mean no IPv6 support, can't fail a test
+-                 ;; because of that (address-family-not-supported doesn't catch that)
+-                 t)
+-               (:no-error (x)
+-                 (declare (ignore x))
+-                 (handler-case
+-                     (let ((port (nth-value 1 (socket-name s1))))
+-                       (socket-bind s2 address port)
+-                       nil)
+-                   (address-in-use-error () t))))
+-          (socket-close s1)
+-          (socket-close s2)))
+-    ((or address-family-not-supported protocol-not-supported-error) () t))
+-  t)
++;#+ipv4-support
++;(deftest inet-socket-bind
++;  (let* ((tcp (get-protocol-by-name "tcp"))
++;         (address (make-inet-address "127.0.0.1"))
++;         (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
++;         (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
++;    (unwind-protect
++;         ;; Given the functions we've got so far, if you can think of a
++;         ;; better way to make sure the bind succeeded than trying it
++;         ;; twice, let me know
++;         (progn
++;           (socket-bind s1 address 0)
++;           (handler-case
++;               (let ((port (nth-value 1 (socket-name s1))))
++;                 (socket-bind s2 address port)
++;                 nil)
++;             (address-in-use-error () t)))
++;      (socket-close s1)
++;      (socket-close s2)))
++;  t)
++
++;#-win32
++;(deftest inet6-socket-bind
++;  (handler-case
++;      (let* ((tcp (get-protocol-by-name "tcp"))
++;             (address (make-inet6-address "::1"))
++;             (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
++;             (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
++;        (unwind-protect
++;             ;; Given the functions we've got so far, if you can think of a
++;             ;; better way to make sure the bind succeeded than trying it
++;             ;; twice, let me know
++;             (handler-case
++;                 (socket-bind s1 address 0)
++;               (socket-error ()
++;                 ;; This may mean no IPv6 support, can't fail a test
++;                 ;; because of that (address-family-not-supported doesn't catch that)
++;                 t)
++;               (:no-error (x)
++;                 (declare (ignore x))
++;                 (handler-case
++;                     (let ((port (nth-value 1 (socket-name s1))))
++;                       (socket-bind s2 address port)
++;                       nil)
++;                   (address-in-use-error () t))))
++;          (socket-close s1)
++;          (socket-close s2)))
++;    ((or address-family-not-supported protocol-not-supported-error) () t))
++;  t)
+ 
+ #+ipv4-support
+ (deftest* (simple-sockopt-test)
+@@ -241,37 +241,37 @@
+ ;;; to look at /etc/syslog.conf or local equivalent to find out where
+ ;;; the message ended up
+ 
+-#-win32
+-(deftest simple-local-client
+-    (progn
+-      ;; SunOS (Solaris) and Darwin systems don't have a socket at
+-      ;; /dev/log.  We might also be building in a chroot or
+-      ;; something, so don't fail this test just because the file is
+-      ;; unavailable, or if it's a symlink to some weird character
+-      ;; device.
+-      (when (block nil
+-              (handler-bind ((sb-posix:syscall-error
+-                              (lambda (e)
+-                                (declare (ignore e))
+-                                (return nil))))
+-                (sb-posix:s-issock
+-                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
+-        (let ((s (make-instance 'local-socket :type :datagram)))
+-          (format t "Connecting ~A... " s)
+-          (finish-output)
+-          (handler-case
+-              (socket-connect s "/dev/log")
+-            (sb-bsd-sockets::socket-error ()
+-              (setq s (make-instance 'local-socket :type :stream))
+-              (format t "failed~%Retrying with ~A... " s)
+-              (finish-output)
+-              (socket-connect s "/dev/log")))
+-          (format t "ok.~%")
+-          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
+-            (format stream
+-                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
+-      t)
+-  t)
++;#-win32
++;(deftest simple-local-client
++;    (progn
++;      ;; SunOS (Solaris) and Darwin systems don't have a socket at
++;      ;; /dev/log.  We might also be building in a chroot or
++;      ;; something, so don't fail this test just because the file is
++;      ;; unavailable, or if it's a symlink to some weird character
++;      ;; device.
++;      (when (block nil
++;              (handler-bind ((sb-posix:syscall-error
++;                              (lambda (e)
++;                                (declare (ignore e))
++;                                (return nil))))
++;                (sb-posix:s-issock
++;                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
++;        (let ((s (make-instance 'local-socket :type :datagram)))
++;          (format t "Connecting ~A... " s)
++;          (finish-output)
++;          (handler-case
++;              (socket-connect s "/dev/log")
++;            (sb-bsd-sockets::socket-error ()
++;              (setq s (make-instance 'local-socket :type :stream))
++;              (format t "failed~%Retrying with ~A... " s)
++;              (finish-output)
++;              (socket-connect s "/dev/log")))
++;          (format t "ok.~%")
++;          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
++;            (format stream
++;                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
++;      t)
++;  t)
+ 
+ 
+ ;;; these require that the internet (or bits of it, at least) is available
+@@ -388,60 +388,60 @@
+        (format t "Received ~A bytes from ~A:~A - ~A ~%"
+                len address port (subseq buf 0 (min 10 len)))))))
+ 
+-#+(and ipv4-support sb-thread)
+-(deftest interrupt-io
+-    (let (result)
+-      (labels
+-          ((client (port)
+-             (setf result
+-                   (let ((s (make-instance 'inet-socket
+-                                           :type :stream
+-                                           :protocol :tcp)))
+-                     (socket-connect s #(127 0 0 1) port)
+-                     (let ((stream (socket-make-stream s
+-                                                       :input t
+-                                                       :output t
+-                                                       :buffering :none)))
+-                       (handler-case
+-                           (prog1
+-                               (catch 'stop
+-                                 (progn
+-                                   (read-char stream)
+-                                   (sleep 0.1)
+-                                   (sleep 0.1)
+-                                   (sleep 0.1)))
+-                             (close stream))
+-                         (error (c)
+-                           c))))))
+-           (server ()
+-             (let ((s (make-instance 'inet-socket
+-                                     :type :stream
+-                                     :protocol :tcp)))
+-               (setf (sockopt-reuse-address s) t)
+-               (socket-bind s (make-inet-address "127.0.0.1") 0)
+-               (socket-listen s 5)
+-               (multiple-value-bind (* port)
+-                   (socket-name s)
+-                 (let* ((client (sb-thread:make-thread
+-                                 (lambda () (client port))))
+-                        (r (socket-accept s))
+-                        (stream (socket-make-stream r
+-                                                    :input t
+-                                                    :output t
+-                                                    :buffering :none))
+-                        (ok :ok))
+-                   (socket-close s)
+-                   (sleep 5)
+-                   (sb-thread:interrupt-thread client
+-                                               (lambda () (throw 'stop ok)))
+-                   (sleep 5)
+-                   (setf ok :not-ok)
+-                   (write-char #\x stream)
+-                   (close stream)
+-                   (socket-close r))))))
+-        (server))
+-      result)
+-  :ok)
++;#+(and ipv4-support sb-thread)
++;(deftest interrupt-io
++;    (let (result)
++;      (labels
++;          ((client (port)
++;             (setf result
++;                   (let ((s (make-instance 'inet-socket
++;                                           :type :stream
++;                                           :protocol :tcp)))
++;                     (socket-connect s #(127 0 0 1) port)
++;                     (let ((stream (socket-make-stream s
++;                                                       :input t
++;                                                       :output t
++;                                                       :buffering :none)))
++;                       (handler-case
++;                           (prog1
++;                               (catch 'stop
++;                                 (progn
++;                                   (read-char stream)
++;                                   (sleep 0.1)
++;                                   (sleep 0.1)
++;                                   (sleep 0.1)))
++;                             (close stream))
++;                         (error (c)
++;                           c))))))
++;           (server ()
++;             (let ((s (make-instance 'inet-socket
++;                                     :type :stream
++;                                     :protocol :tcp)))
++;               (setf (sockopt-reuse-address s) t)
++;               (socket-bind s (make-inet-address "127.0.0.1") 0)
++;               (socket-listen s 5)
++;               (multiple-value-bind (* port)
++;                   (socket-name s)
++;                 (let* ((client (sb-thread:make-thread
++;                                 (lambda () (client port))))
++;                        (r (socket-accept s))
++;                        (stream (socket-make-stream r
++;                                                    :input t
++;                                                    :output t
++;                                                    :buffering :none))
++;                        (ok :ok))
++;                   (socket-close s)
++;                   (sleep 5)
++;                   (sb-thread:interrupt-thread client
++;                                               (lambda () (throw 'stop ok)))
++;                   (sleep 5)
++;                   (setf ok :not-ok)
++;                   (write-char #\x stream)
++;                   (close stream)
++;                   (socket-close r))))))
++;        (server))
++;      result)
++;  :ok)
+ 
+ (defmacro with-client-and-server ((server-socket-var client-socket-var) &body body)
+   (let ((listen-socket (gensym "LISTEN-SOCKET")))
+@@ -501,5 +501,6 @@
+             (define-shutdown-test ,(make-name 'shutdown.client.ub8)
+               client server (unsigned-byte 8) ,direction)))))
+ 
+-  (define-shutdown-tests :output)
+-  (define-shutdown-tests :io))
++;  (define-shutdown-tests :output)
++;  (define-shutdown-tests :io)
++)

diff --git a/dev-lisp/sbcl/sbcl-1.3.19.ebuild b/dev-lisp/sbcl/sbcl-1.3.19.ebuild
new file mode 100644
index 00000000..acdabe50
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.3.19.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.2.7
+BV_AMD64=1.3.19
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.3.12
+BV_ARM64=1.3.16
+BV_PPC_MACOS=1.0.47
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_SPARC_SOLARIS=1.0.23
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-1.3.15.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/${PN}-1.3.19-bsd-sockets-test.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
+
+	eapply_user
+
+	# bug #526194
+	sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
+		-e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug 174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
@ 2022-04-01 11:12 Ulrich Müller
  0 siblings, 0 replies; 13+ messages in thread
From: Ulrich Müller @ 2022-04-01 11:12 UTC (permalink / raw
  To: gentoo-commits

commit:     9eb68983fcb0208ae6e35b1d3b0ce72c9cf8d17c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 10:30:00 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 10:30:00 2022 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=9eb68983

dev-lisp/sbcl: Remove package

Newer version in gentoo repository.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 dev-lisp/sbcl/files/concurrency-test-1.3.15.patch  |  17 -
 dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch     |  40 ---
 dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch      |  12 -
 .../sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch   | 383 ---------------------
 dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch |  29 --
 dev-lisp/sbcl/metadata.xml                         |  28 --
 dev-lisp/sbcl/sbcl-1.4.10.ebuild                   | 246 -------------
 dev-lisp/sbcl/sbcl-1.4.9.ebuild                    | 246 -------------
 8 files changed, 1001 deletions(-)

diff --git a/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch b/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch
deleted file mode 100644
index 53b5bea0..00000000
--- a/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -r -U2 sbcl-1.3.15.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-1.3.15/contrib/sb-concurrency/tests/test-frlock.lisp
---- sbcl-1.3.15.orig/contrib/sb-concurrency/tests/test-frlock.lisp	2017-02-28 20:51:29.000000000 +0100
-+++ sbcl-1.3.15/contrib/sb-concurrency/tests/test-frlock.lisp	2017-03-02 18:15:41.225284441 +0100
-@@ -25,5 +25,5 @@
- (defun test-frlocks (&key (reader-count 100) (read-count 1000000)
-                           (outer-read-pause 0) (inner-read-pause 0)
--                          (writer-count 10) (write-count (/ 1 *minimum-sleep*))
-+                          (writer-count 10) (write-count 5000)
-                           (outer-write-pause *minimum-sleep*) (inner-write-pause 0))
-     (let ((rw (make-frlock))
-@@ -88,5 +88,5 @@
- (deftest* (frlock.1)
-     (handler-case
--        (sb-ext:with-timeout 10
-+        (sb-ext:with-timeout 240
-           (test-frlocks #+win32 :outer-write-pause #+win32 t ))
-       (sb-ext:timeout (c)

diff --git a/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch b/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch
deleted file mode 100644
index 517208a7..00000000
--- a/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -r -U1 sbcl-1.2.15.orig/contrib/sb-posix/posix-tests.lisp sbcl-1.2.15/contrib/sb-posix/posix-tests.lisp
---- sbcl-1.2.15.orig/contrib/sb-posix/posix-tests.lisp	2015-08-31 00:59:03.000000000 +0600
-+++ sbcl-1.2.15/contrib/sb-posix/posix-tests.lisp	2015-09-22 10:19:20.000000000 +0600
-@@ -169,19 +169,19 @@
- 
--(deftest rmdir.error.3
--  (handler-case
--      (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir"))
--    (sb-posix:syscall-error (c)
--      (typep
--       (sb-posix:syscall-errno c)
--       '(member
--         #+(or darwin openbsd)
--         #.sb-posix:eisdir
--         #+win32
--         #.sb-posix::eacces
--         #+win32
--         #.sb-posix::enotempty
--         #+sunos
--         #.sb-posix::einval
--         #-(or darwin openbsd win32 sunos)
--         #.sb-posix::ebusy)))) t)
-+;(deftest rmdir.error.3
-+;  (handler-case
-+;      (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir"))
-+;    (sb-posix:syscall-error (c)
-+;      (typep
-+;       (sb-posix:syscall-errno c)
-+;       '(member
-+;         #+(or darwin openbsd)
-+;         #.sb-posix:eisdir
-+;         #+win32
-+;         #.sb-posix::eacces
-+;         #+win32
-+;         #.sb-posix::enotempty
-+;         #+sunos
-+;         #.sb-posix::einval
-+;         #-(or darwin openbsd win32 sunos)
-+;         #.sb-posix::ebusy)))) t)
- 

diff --git a/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch b/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch
deleted file mode 100644
index 850fd5d9..00000000
--- a/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -U2 sbcl-1.2.11.orig/src/runtime/Config.x86-sunos sbcl-1.2.11/src/runtime/Config.x86-sunos
---- sbcl-1.2.11.orig/src/runtime/Config.x86-sunos	2015-04-27 20:56:50.000000000 +0600
-+++ sbcl-1.2.11/src/runtime/Config.x86-sunos	2015-04-28 22:38:01.569103626 +0600
-@@ -12,6 +12,6 @@
- CC=gcc
- CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
--NM = nm -xgp
--GREP = ggrep
-+NM = nm -t x -p
-+GREP = grep
- 
- ASSEM_SRC = x86-assem.S ldso-stubs.S

diff --git a/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch b/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch
deleted file mode 100644
index d51bdd5c..00000000
--- a/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch
+++ /dev/null
@@ -1,383 +0,0 @@
-diff -Nuar a/contrib/sb-bsd-sockets/tests.lisp b/contrib/sb-bsd-sockets/tests.lisp
---- a/contrib/sb-bsd-sockets/tests.lisp	2017-09-30 18:30:58.000000000 +0200
-+++ b/contrib/sb-bsd-sockets/tests.lisp	2017-10-01 18:45:57.132900158 +0200
-@@ -18,11 +18,11 @@
-   (equalp (make-inet-address "242.1.211.3")  #(242 1 211 3))
-   t)
- 
--#-win32
--(deftest make-inet6-address.1
--    (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
--            #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255))
--  t)
-+;#-win32
-+;(deftest make-inet6-address.1
-+;    (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
-+;            #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255))
-+;  t)
- 
- (deftest get-protocol-by-name/tcp
-     (integerp (get-protocol-by-name "tcp"))
-@@ -35,15 +35,15 @@
- ;;; See https://bugs.launchpad.net/sbcl/+bug/659857
- ;;; Apparently getprotobyname_r on FreeBSD says -1 and EINTR
- ;;; for unknown protocols...
--#-(and freebsd sb-thread)
--#-(and dragonfly sb-thread)
--(deftest get-protocol-by-name/error
--  (handler-case (get-protocol-by-name "nonexistent-protocol")
--    (unknown-protocol ()
--      t)
--    (:no-error ()
--      nil))
--  t)
-+;#-(and freebsd sb-thread)
-+;#-(and dragonfly sb-thread)
-+;(deftest get-protocol-by-name/error
-+;  (handler-case (get-protocol-by-name "nonexistent-protocol")
-+;    (unknown-protocol ()
-+;      t)
-+;    (:no-error ()
-+;      nil))
-+;  t)
- 
- (when (handler-case (make-instance 'inet-socket
-                                    :type :stream
-@@ -102,21 +102,21 @@
-       (:no-error nil))
-   t)
- 
--#-win32
--(deftest make-inet6-socket.smoke
--  (handler-case
--      (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
--        (> (socket-file-descriptor s) 1))
--    ((or address-family-not-supported protocol-not-supported-error) () t))
--  t)
--
--#-win32
--(deftest make-inet6-socket.keyword
--  (handler-case
--      (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
--        (> (socket-file-descriptor s) 1))
--    ((or address-family-not-supported protocol-not-supported-error) () t))
--  t)
-+;#-win32
-+;(deftest make-inet6-socket.smoke
-+;  (handler-case
-+;      (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
-+;        (> (socket-file-descriptor s) 1))
-+;    ((or address-family-not-supported protocol-not-supported-error) () t))
-+;  t)
-+
-+;#-win32
-+;(deftest make-inet6-socket.keyword
-+;  (handler-case
-+;      (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
-+;        (> (socket-file-descriptor s) 1))
-+;    ((or address-family-not-supported protocol-not-supported-error) () t))
-+;  t)
- 
- #+ipv4-support
- (deftest* (non-block-socket)
-@@ -125,55 +125,55 @@
-     (non-blocking-mode s))
-   t)
- 
--#+ipv4-support
--(deftest inet-socket-bind
--  (let* ((tcp (get-protocol-by-name "tcp"))
--         (address (make-inet-address "127.0.0.1"))
--         (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
--         (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
--    (unwind-protect
--         ;; Given the functions we've got so far, if you can think of a
--         ;; better way to make sure the bind succeeded than trying it
--         ;; twice, let me know
--         (progn
--           (socket-bind s1 address 0)
--           (handler-case
--               (let ((port (nth-value 1 (socket-name s1))))
--                 (socket-bind s2 address port)
--                 nil)
--             (address-in-use-error () t)))
--      (socket-close s1)
--      (socket-close s2)))
--  t)
--
--#-win32
--(deftest inet6-socket-bind
--  (handler-case
--      (let* ((tcp (get-protocol-by-name "tcp"))
--             (address (make-inet6-address "::1"))
--             (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
--             (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
--        (unwind-protect
--             ;; Given the functions we've got so far, if you can think of a
--             ;; better way to make sure the bind succeeded than trying it
--             ;; twice, let me know
--             (handler-case
--                 (socket-bind s1 address 0)
--               (socket-error ()
--                 ;; This may mean no IPv6 support, can't fail a test
--                 ;; because of that (address-family-not-supported doesn't catch that)
--                 t)
--               (:no-error (x)
--                 (declare (ignore x))
--                 (handler-case
--                     (let ((port (nth-value 1 (socket-name s1))))
--                       (socket-bind s2 address port)
--                       nil)
--                   (address-in-use-error () t))))
--          (socket-close s1)
--          (socket-close s2)))
--    ((or address-family-not-supported protocol-not-supported-error) () t))
--  t)
-+;#+ipv4-support
-+;(deftest inet-socket-bind
-+;  (let* ((tcp (get-protocol-by-name "tcp"))
-+;         (address (make-inet-address "127.0.0.1"))
-+;         (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
-+;         (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
-+;    (unwind-protect
-+;         ;; Given the functions we've got so far, if you can think of a
-+;         ;; better way to make sure the bind succeeded than trying it
-+;         ;; twice, let me know
-+;         (progn
-+;           (socket-bind s1 address 0)
-+;           (handler-case
-+;               (let ((port (nth-value 1 (socket-name s1))))
-+;                 (socket-bind s2 address port)
-+;                 nil)
-+;             (address-in-use-error () t)))
-+;      (socket-close s1)
-+;      (socket-close s2)))
-+;  t)
-+
-+;#-win32
-+;(deftest inet6-socket-bind
-+;  (handler-case
-+;      (let* ((tcp (get-protocol-by-name "tcp"))
-+;             (address (make-inet6-address "::1"))
-+;             (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
-+;             (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
-+;        (unwind-protect
-+;             ;; Given the functions we've got so far, if you can think of a
-+;             ;; better way to make sure the bind succeeded than trying it
-+;             ;; twice, let me know
-+;             (handler-case
-+;                 (socket-bind s1 address 0)
-+;               (socket-error ()
-+;                 ;; This may mean no IPv6 support, can't fail a test
-+;                 ;; because of that (address-family-not-supported doesn't catch that)
-+;                 t)
-+;               (:no-error (x)
-+;                 (declare (ignore x))
-+;                 (handler-case
-+;                     (let ((port (nth-value 1 (socket-name s1))))
-+;                       (socket-bind s2 address port)
-+;                       nil)
-+;                   (address-in-use-error () t))))
-+;          (socket-close s1)
-+;          (socket-close s2)))
-+;    ((or address-family-not-supported protocol-not-supported-error) () t))
-+;  t)
- 
- #+ipv4-support
- (deftest* (simple-sockopt-test)
-@@ -241,37 +241,37 @@
- ;;; to look at /etc/syslog.conf or local equivalent to find out where
- ;;; the message ended up
- 
--#-win32
--(deftest simple-local-client
--    (progn
--      ;; SunOS (Solaris) and Darwin systems don't have a socket at
--      ;; /dev/log.  We might also be building in a chroot or
--      ;; something, so don't fail this test just because the file is
--      ;; unavailable, or if it's a symlink to some weird character
--      ;; device.
--      (when (block nil
--              (handler-bind ((sb-posix:syscall-error
--                              (lambda (e)
--                                (declare (ignore e))
--                                (return nil))))
--                (sb-posix:s-issock
--                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
--        (let ((s (make-instance 'local-socket :type :datagram)))
--          (format t "Connecting ~A... " s)
--          (finish-output)
--          (handler-case
--              (socket-connect s "/dev/log")
--            (sb-bsd-sockets::socket-error ()
--              (setq s (make-instance 'local-socket :type :stream))
--              (format t "failed~%Retrying with ~A... " s)
--              (finish-output)
--              (socket-connect s "/dev/log")))
--          (format t "ok.~%")
--          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
--            (format stream
--                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
--      t)
--  t)
-+;#-win32
-+;(deftest simple-local-client
-+;    (progn
-+;      ;; SunOS (Solaris) and Darwin systems don't have a socket at
-+;      ;; /dev/log.  We might also be building in a chroot or
-+;      ;; something, so don't fail this test just because the file is
-+;      ;; unavailable, or if it's a symlink to some weird character
-+;      ;; device.
-+;      (when (block nil
-+;              (handler-bind ((sb-posix:syscall-error
-+;                              (lambda (e)
-+;                                (declare (ignore e))
-+;                                (return nil))))
-+;                (sb-posix:s-issock
-+;                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
-+;        (let ((s (make-instance 'local-socket :type :datagram)))
-+;          (format t "Connecting ~A... " s)
-+;          (finish-output)
-+;          (handler-case
-+;              (socket-connect s "/dev/log")
-+;            (sb-bsd-sockets::socket-error ()
-+;              (setq s (make-instance 'local-socket :type :stream))
-+;              (format t "failed~%Retrying with ~A... " s)
-+;              (finish-output)
-+;              (socket-connect s "/dev/log")))
-+;          (format t "ok.~%")
-+;          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
-+;            (format stream
-+;                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
-+;      t)
-+;  t)
- 
- ;;; these require that the internet (or bits of it, at least) is available
- 
-@@ -387,60 +387,60 @@
-        (format t "Received ~A bytes from ~A:~A - ~A ~%"
-                len address port (subseq buf 0 (min 10 len)))))))
- 
--#+(and ipv4-support sb-thread)
--(deftest interrupt-io
--    (let (result)
--      (labels
--          ((client (port)
--             (setf result
--                   (let ((s (make-instance 'inet-socket
--                                           :type :stream
--                                           :protocol :tcp)))
--                     (socket-connect s #(127 0 0 1) port)
--                     (let ((stream (socket-make-stream s
--                                                       :input t
--                                                       :output t
--                                                       :buffering :none)))
--                       (handler-case
--                           (prog1
--                               (catch 'stop
--                                 (progn
--                                   (read-char stream)
--                                   (sleep 0.1)
--                                   (sleep 0.1)
--                                   (sleep 0.1)))
--                             (close stream))
--                         (error (c)
--                           c))))))
--           (server ()
--             (let ((s (make-instance 'inet-socket
--                                     :type :stream
--                                     :protocol :tcp)))
--               (setf (sockopt-reuse-address s) t)
--               (socket-bind s (make-inet-address "127.0.0.1") 0)
--               (socket-listen s 5)
--               (multiple-value-bind (* port)
--                   (socket-name s)
--                 (let* ((client (sb-thread:make-thread
--                                 (lambda () (client port))))
--                        (r (socket-accept s))
--                        (stream (socket-make-stream r
--                                                    :input t
--                                                    :output t
--                                                    :buffering :none))
--                        (ok :ok))
--                   (socket-close s)
--                   (sleep 5)
--                   (sb-thread:interrupt-thread client
--                                               (lambda () (throw 'stop ok)))
--                   (sleep 5)
--                   (setf ok :not-ok)
--                   (write-char #\x stream)
--                   (close stream)
--                   (socket-close r))))))
--        (server))
--      result)
--  :ok)
-+;#+(and ipv4-support sb-thread)
-+;(deftest interrupt-io
-+;    (let (result)
-+;      (labels
-+;          ((client (port)
-+;             (setf result
-+;                   (let ((s (make-instance 'inet-socket
-+;                                           :type :stream
-+;                                           :protocol :tcp)))
-+;                     (socket-connect s #(127 0 0 1) port)
-+;                     (let ((stream (socket-make-stream s
-+;                                                       :input t
-+;                                                       :output t
-+;                                                       :buffering :none)))
-+;                       (handler-case
-+;                           (prog1
-+;                               (catch 'stop
-+;                                 (progn
-+;                                   (read-char stream)
-+;                                   (sleep 0.1)
-+;                                   (sleep 0.1)
-+;                                   (sleep 0.1)))
-+;                             (close stream))
-+;                         (error (c)
-+;                           c))))))
-+;           (server ()
-+;             (let ((s (make-instance 'inet-socket
-+;                                     :type :stream
-+;                                     :protocol :tcp)))
-+;               (setf (sockopt-reuse-address s) t)
-+;               (socket-bind s (make-inet-address "127.0.0.1") 0)
-+;               (socket-listen s 5)
-+;               (multiple-value-bind (* port)
-+;                   (socket-name s)
-+;                 (let* ((client (sb-thread:make-thread
-+;                                 (lambda () (client port))))
-+;                        (r (socket-accept s))
-+;                        (stream (socket-make-stream r
-+;                                                    :input t
-+;                                                    :output t
-+;                                                    :buffering :none))
-+;                        (ok :ok))
-+;                   (socket-close s)
-+;                   (sleep 5)
-+;                   (sb-thread:interrupt-thread client
-+;                                               (lambda () (throw 'stop ok)))
-+;                   (sleep 5)
-+;                   (setf ok :not-ok)
-+;                   (write-char #\x stream)
-+;                   (close stream)
-+;                   (socket-close r))))))
-+;        (server))
-+;      result)
-+;  :ok)
- 
- (defmacro with-client-and-server (((socket-class &rest common-initargs)
-                                    (listen-socket-var &rest listen-address)
-@@ -503,8 +503,9 @@
-             (define-shutdown-test ,(make-name 'shutdown.client.ub8)
-               client server (unsigned-byte 8) ,direction)))))
- 
--  (define-shutdown-tests :output)
--  (define-shutdown-tests :io))
-+;  (define-shutdown-tests :output)
-+;  (define-shutdown-tests :io)
-+)
- 
- #+linux
- (deftest abstract.smoke

diff --git a/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch b/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch
deleted file mode 100644
index 27ad3b07..00000000
--- a/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nuar a/make.sh b/make.sh
---- a/make.sh	2017-09-30 18:30:58.000000000 +0200
-+++ b/make.sh	2017-10-01 18:08:26.742909789 +0200
-@@ -24,7 +24,7 @@
- # thing" when run on the target machine, with the minor caveat that
- # any --xc-host parameter should be suitable for the host machine
- # instead of the target.
--sh make-config.sh "$@" || exit $?
-+sh -x make-config.sh "$@" || exit $?
- 
- . output/prefix.def
- . output/build-config
-@@ -76,11 +76,11 @@
-         $@
-     fi
- }
--maybetime sh make-host-1.sh
--maybetime sh make-target-1.sh
--maybetime sh make-host-2.sh
--maybetime sh make-target-2.sh
--maybetime sh make-target-contrib.sh
-+maybetime sh -x make-host-1.sh
-+maybetime sh -x make-target-1.sh
-+maybetime sh -x make-host-2.sh
-+maybetime sh -x make-target-2.sh
-+maybetime sh -x make-target-contrib.sh
- 
- NCONTRIBS=`find contrib -name Makefile -print | wc -l`
- NPASSED=`find obj/asdf-cache -name test-passed.test-report -print | wc -l`

diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml
deleted file mode 100644
index 377efac5..00000000
--- a/dev-lisp/sbcl/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>common-lisp@gentoo.org</email>
-		<name>Gentoo Common Lisp Project</name>
-	</maintainer>
-	<longdescription>
-		Steel Bank Common Lisp is an open source Common Lisp implementation.  It
-		provides an integrated native compiler, interpreter, and debugger.
-
-		SBCL is a fork off of the main branch of CMUCL.  SBCL is distinguished from
-		CMUCL by a greater emphasis on maintainability.  In particular, the SBCL system
-		can be built directly from its source code, so that the output corresponds to
-		the source code in a controlled, verifiable way, and arbitrary changes can be
-		made to the system without causing bootstrapping problems.  SBCL also places
-		less emphasis than CMU CL does on new non-ANSI extensions, or on backward
-		compatibility with old non-ANSI features.
-
-		Support for native threading on GNU/Linux is available for the x86 and amd64
-		platforms using an NPTL enabled GLIBC.
-		
-		SBCL 0.8.17 and later support Unicode.
-	</longdescription>
-	<use>
-		<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
-	</use>
-</pkgmetadata>

diff --git a/dev-lisp/sbcl/sbcl-1.4.10.ebuild b/dev-lisp/sbcl/sbcl-1.4.10.ebuild
deleted file mode 100644
index f07d8939..00000000
--- a/dev-lisp/sbcl/sbcl-1.4.10.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib eutils flag-o-matic pax-utils
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.4.3
-BV_AMD64=1.4.8
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.3.12
-BV_ARM64=1.4.2
-BV_X86_MACOS=1.1.6
-BV_X64_MACOS=1.2.11
-BV_PPC_MACOS=1.0.47
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-BV_SPARC_SOLARIS=1.0.23
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
-	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
-	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
-	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
-	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
-	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
-	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
-	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode pax_kernel zlib"
-
-CDEPEND=">=dev-lisp/asdf-3.1:="
-DEPEND="${CDEPEND}
-		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-		pax_kernel? ( sys-apps/elfix )"
-RDEPEND="${CDEPEND}
-		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	sed 's/^X//' > "${CONFIG}" <<-'EOF'
-	(lambda (list)
-	X  (flet ((enable  (x) (pushnew x list))
-	X         (disable (x) (setf list (remove x list))))
-	EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "true" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep zlib)" ":sb-core-compression"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
-	X    )
-	X  list)
-	EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv sbcl-*-* sbcl-binary || die
-	cd "${S}"
-}
-
-src_prepare() {
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-1.3.15.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-
-	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
-	eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch
-
-	eapply_user
-
-	# Make sure the *FLAGS variables are sane.
-	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
-	strip-unsupported-flags
-	filter-flags -fomit-frame-pointer -Wl,-s
-	filter-ldflags -s
-
-	# original bugs #526194, #620532
-	# this broke no-pie default builds, c.f. bug #632670
-	# Pass CFLAGS down by appending our value, to let users override
-	# the default values.
-	# Keep passing LDFLAGS down via the LINKFLAGS variable.
-	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	# Use installed ASDF version
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-	# Avoid installation of ASDF info page. See bug #605752
-	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh || die
-	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
-	# #define SBCL_HOME ...
-	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
-	# change location of /etc/sbclrc ...
-	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
-	find . -type f -name .cvsignore -delete
-}
-
-src_configure() {
-	# customizing SBCL version as per
-	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
-	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-
-	if use pax_kernel ; then
-		# To disable PaX on hardened systems
-		pax-mark -mr "${bindir}"/src/runtime/sbcl
-
-		# Hack to disable PaX on second GENESIS stage
-		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
-			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
-	fi
-
-	# clear the environment to get rid of non-ASCII strings, see bug #174702
-	# set HOME for paludis
-	env - HOME="${T}" PATH="${PATH}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		GNUMAKE=make ./make.sh \
-		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
-	;;; The following is required if you want source location functions to
-	;;; work in SLIME, for example.
-	X
-	(setf (logical-pathname-translations "SYS")
-	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
-	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
-	X
-	;;; Setup ASDF2
-	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
-	EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# bug #517008
-	pax-mark -mr "${D}"/usr/bin/sbcl
-
-	# rm empty directories lest paludis complain about this
-	find "${ED}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dodoc -r doc/internals/sbcl-internals
-
-		doinfo doc/manual/*.info*
-		doinfo doc/internals/sbcl-internals.info
-
-		docinto internals-notes
-		dodoc doc/internals-notes/*
-	else
-		rm -Rv "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}

diff --git a/dev-lisp/sbcl/sbcl-1.4.9.ebuild b/dev-lisp/sbcl/sbcl-1.4.9.ebuild
deleted file mode 100644
index f07d8939..00000000
--- a/dev-lisp/sbcl/sbcl-1.4.9.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib eutils flag-o-matic pax-utils
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.4.3
-BV_AMD64=1.4.8
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.3.12
-BV_ARM64=1.4.2
-BV_X86_MACOS=1.1.6
-BV_X64_MACOS=1.2.11
-BV_PPC_MACOS=1.0.47
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-BV_SPARC_SOLARIS=1.0.23
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
-	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
-	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
-	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
-	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
-	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
-	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
-	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode pax_kernel zlib"
-
-CDEPEND=">=dev-lisp/asdf-3.1:="
-DEPEND="${CDEPEND}
-		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-		pax_kernel? ( sys-apps/elfix )"
-RDEPEND="${CDEPEND}
-		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	sed 's/^X//' > "${CONFIG}" <<-'EOF'
-	(lambda (list)
-	X  (flet ((enable  (x) (pushnew x list))
-	X         (disable (x) (setf list (remove x list))))
-	EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "true" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep zlib)" ":sb-core-compression"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
-	X    )
-	X  list)
-	EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv sbcl-*-* sbcl-binary || die
-	cd "${S}"
-}
-
-src_prepare() {
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-1.3.15.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-
-	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
-	eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch
-
-	eapply_user
-
-	# Make sure the *FLAGS variables are sane.
-	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
-	strip-unsupported-flags
-	filter-flags -fomit-frame-pointer -Wl,-s
-	filter-ldflags -s
-
-	# original bugs #526194, #620532
-	# this broke no-pie default builds, c.f. bug #632670
-	# Pass CFLAGS down by appending our value, to let users override
-	# the default values.
-	# Keep passing LDFLAGS down via the LINKFLAGS variable.
-	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	# Use installed ASDF version
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-	# Avoid installation of ASDF info page. See bug #605752
-	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh || die
-	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
-	# #define SBCL_HOME ...
-	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
-	# change location of /etc/sbclrc ...
-	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
-	find . -type f -name .cvsignore -delete
-}
-
-src_configure() {
-	# customizing SBCL version as per
-	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
-	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-
-	if use pax_kernel ; then
-		# To disable PaX on hardened systems
-		pax-mark -mr "${bindir}"/src/runtime/sbcl
-
-		# Hack to disable PaX on second GENESIS stage
-		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
-			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
-	fi
-
-	# clear the environment to get rid of non-ASCII strings, see bug #174702
-	# set HOME for paludis
-	env - HOME="${T}" PATH="${PATH}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		GNUMAKE=make ./make.sh \
-		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
-	;;; The following is required if you want source location functions to
-	;;; work in SLIME, for example.
-	X
-	(setf (logical-pathname-translations "SYS")
-	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
-	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
-	X
-	;;; Setup ASDF2
-	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
-	EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# bug #517008
-	pax-mark -mr "${D}"/usr/bin/sbcl
-
-	# rm empty directories lest paludis complain about this
-	find "${ED}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dodoc -r doc/internals/sbcl-internals
-
-		doinfo doc/manual/*.info*
-		doinfo doc/internals/sbcl-internals.info
-
-		docinto internals-notes
-		dodoc doc/internals-notes/*
-	else
-		rm -Rv "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2022-04-01 11:12 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-08  0:03 [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/ Stelian Ionescu
  -- strict thread matches above, loose matches on Subject: below --
2022-04-01 11:12 Ulrich Müller
2017-07-02 16:11 José María Alonso
2017-04-04 18:39 José María Alonso
2017-04-04 18:05 José María Alonso
2014-12-17 16:17 José María Alonso
2013-04-05  0:31 Stelian Ionescu
2012-02-04 20:15 Stelian Ionescu
2011-11-04 10:10 Stelian Ionescu
2011-08-26 23:20 Stelian Ionescu
2011-07-14 16:37 Stelian Ionescu
2011-06-08 16:20 Stelian Ionescu
2011-03-29 22:51 Stelian Ionescu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox