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

["Stelian Ionescu" <sionescu@cddr.org>]

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