diff options
| -rw-r--r-- | dev-lisp/sbcl/Manifest | 5 | ||||
| -rw-r--r-- | dev-lisp/sbcl/files/1.0.50-fix-linux-kernel-version-parsing.patch | 38 | ||||
| -rw-r--r-- | dev-lisp/sbcl/files/1.0.51-gentoo-fix_build_system.patch (renamed from dev-lisp/sbcl/files/1.0.50-gentoo-fix_build_system.patch) | 359 | ||||
| -rw-r--r-- | dev-lisp/sbcl/sbcl-1.0.51.ebuild | 1 |
4 files changed, 205 insertions, 198 deletions
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest index f13b57ed..e5901cfb 100644 --- a/dev-lisp/sbcl/Manifest +++ b/dev-lisp/sbcl/Manifest @@ -1,5 +1,4 @@ -AUX 1.0.50-fix-linux-kernel-version-parsing.patch 1154 RMD160 214206afd70bf8a80c2cef29343aa11651b90925 SHA1 56a0cbc0b259b5262f2fa780e9918edad6f8d06f SHA256 7ebcd2125ac2967e942bce3736cfc47cfc4cb68ff51555bd6b1afdcac098823a -AUX 1.0.50-gentoo-fix_build_system.patch 21265 RMD160 b596d67332989dac7ea4391f99c875222a720def SHA1 a67c4f1fafad5eb373341cdd1f3353733e5a137c SHA256 678b51896731e00a6d1fb73edd5d306deb99d9c5485a3359a989f31eff4261db +AUX 1.0.51-gentoo-fix_build_system.patch 19553 RMD160 062c3bd0b0f14e0bc302072bc533b64b1d2671d0 SHA1 12160c2951df764c874273db2a8f9c6caa72c942 SHA256 8ee0f616550b9da863211caba88c68b284cb24be5793fa6d9ecbe153f3dd44f2 AUX gentoo-fix_install_man.patch 399 RMD160 8cbc6d8d2f70c10cf76a0a2a3e574b8267d97370 SHA1 44186fdfdd12db5094abed07259016dc6b377695 SHA256 7e3e3f84be6d4dae51953825daaf26d8fe1482fd2f4e9d017297dd8ef55ebe47 AUX gentoo-fix_linux-os-c.patch 418 RMD160 558a7cc1c212729e39f746d7db9cc7324d23a64f SHA1 5ff812499525ec51c0debdac78fc6d39bc4d55a0 SHA256 50b310b3d72b380b91828730a5539638decb6a4df6d28f93dff84ddad824b2ae DIST sbcl-1.0.23-mips-linux-binary.tar.bz2 7932957 RMD160 5fc1f48beff1b67e101875aae4108fa2aa90d574 SHA1 fd409307855d354469297334588a988c35db386d SHA256 9a4ef25e7119ad12ca4789ad8e333b6550bbb865f8eae06c9fb66fbf9323f960 @@ -10,5 +9,5 @@ DIST sbcl-1.0.28-sparc-linux-binary.tar.bz2 8032042 RMD160 ca965bd20980f9f9b528a DIST sbcl-1.0.37-x86-64-linux-binary.tar.bz2 8702821 RMD160 7fbe97150a2821e80c8b0a8b3b21eec28280ad1d SHA1 d3df7f9670addcf4f2ad7f1f6832161747e6390d SHA256 0757a1d49d5452c9bef8d1c270dd423aa1b752e6a7ce4a3ffb546253e1bf56f3 DIST sbcl-1.0.37-x86-linux-binary.tar.bz2 8815040 RMD160 0bca593f88b085f49586755d713c9004e3c689a0 SHA1 ed54d6b36d8abf0074babed30eb48ed0d9bdc894 SHA256 3d04ffc7c71afe523858799386a3175467556648b27184e39f62df8f60cf7268 DIST sbcl-1.0.51-source.tar.bz2 3574742 RMD160 3f0e0104d705e81603c940ea99afefa4292a3ded SHA1 2a026f50c596b7222e31f28d03477cd166085499 SHA256 d227fa2ffe3e53365123b1c70b1d224138082e5bdac750750613ecf8ee61074e -EBUILD sbcl-1.0.51.ebuild 5909 RMD160 d0bd5c96112c9e0d0fe7689f0e9b6fe98bbd90ce SHA1 34cc7568e8f6f8c40699de9e4d9fe3cc1beb7562 SHA256 3d49d0183a3bbf9ca23b5545df0bb4a3482b3992f306aa6a784f4c76363a811f +EBUILD sbcl-1.0.51.ebuild 5842 RMD160 33cab109c42ea95cc23db7d8b35c9987bc095b03 SHA1 ed9590b4bb92068c0dcea57202e092b67fc0d4ed SHA256 f8238f2235f0abf9f2690dee1a6059fa12a679ff6c7345d98eadb7b920fbbf49 MISC metadata.xml 1192 RMD160 cc9ef1f835468d8901a7fac96ff183cffaa8448f SHA1 d628ab8da2e19ab42b6df9dcd1afc09e3efdcd05 SHA256 b5fb21d6b7020a9ebde8793cfb7209ee1db5c5d6ee0b1c8fd6c7b7e3a3db27b1 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 cf3746a2..00000000 --- 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 index fbfcff2d..f3dbbc7f 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 ccc2edaf..4c47165b 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 |