From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RMGjl-0006Nz-T0 for garchives@archives.gentoo.org; Fri, 04 Nov 2011 10:11:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F49A21C083; Fri, 4 Nov 2011 10:10:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 42C4321C083 for ; Fri, 4 Nov 2011 10:10:53 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 739161B402A for ; Fri, 4 Nov 2011 10:10:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DCF0780042 for ; Fri, 4 Nov 2011 10:10:51 +0000 (UTC) From: "Stelian Ionescu" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stelian Ionescu" Message-ID: Subject: [gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/ X-VCS-Repository: proj/lisp X-VCS-Files: dev-lisp/sbcl/files/1.0.51-gentoo-fix_build_system.patch dev-lisp/sbcl/sbcl-1.0.51.ebuild dev-lisp/sbcl/sbcl-1.0.52.ebuild X-VCS-Directories: dev-lisp/sbcl/ dev-lisp/sbcl/files/ X-VCS-Committer: fenlix X-VCS-Committer-Name: Stelian Ionescu X-VCS-Revision: bdf1583eeb73a130d592e535a5d18f5ee38691c3 Date: Fri, 4 Nov 2011 10:10:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ef19f350-00d3-4245-a38b-0edd49eab91f X-Archives-Hash: 7a6d72a7ce9f4f2c86a76c6e35de7e02 commit: bdf1583eeb73a130d592e535a5d18f5ee38691c3 Author: Stelian Ionescu cddr org> AuthorDate: Fri Nov 4 10:10:06 2011 +0000 Commit: Stelian Ionescu cddr org> CommitDate: Fri Nov 4 10:10:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/lisp.git;a=3D= commit;h=3Dbdf1583e 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 =3D> 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/d= ev-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=3Dgcc -=20 - # We need to extend flags to the C compiler and the linker -@@ -7,6 +9,9 @@ CC=3Dgcc - # directly via ASDF from a non-C-aware module which has these tricky - # ones as dependencies. -=20 -+# from src/runtime/ -+-include platform.mk -+ - UNAME:=3D$(shell uname -s) -=20 - ifeq (SunOS,$(UNAME)) -@@ -23,7 +28,9 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) - CC:=3D$(shell cygpath -m $(shell readlink -fn $(shell which $(CC)))) - endif -=20 --export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS -+EXTRA_CFLAGS +=3D $(CFLAGS) -+ -+export CC SBCL EXTRA_CFLAGS -=20 - 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 -=20 - $(MODULE).fasl: $(MODULE).lisp ../../output/sbcl.core - $(SBCL) --eval '(compile-file (format nil "SYS:CONTRIB;~:@(~A~);~:@(~A= ~).LISP" "$(MODULE)" "$(MODULE)"))' &1 && touch $i/test-passed ; then -+ if $GNUMAKE -C $i -I ../../src/runtime test 2>&1 && touch $i/test-p= assed ; then - : - else - exit $? -diff --git a/src/runtime/Config.alpha-linux b/src/runtime/Config.alpha-l= inux -index 42df1fc..50de020 100644 ---- a/src/runtime/Config.alpha-linux -+++ b/src/runtime/Config.alpha-linux -@@ -10,7 +10,7 @@ - # files for more information. -=20 - LD =3D ld -taso --LINKFLAGS +=3D -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynamic -+SBCL_LDFLAGS +=3D -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynami= c - NM =3D ./linux-nm -=20 - ASSEM_SRC =3D alpha-assem.S ldso-stubs.S -diff --git a/src/runtime/Config.alpha-osf1 b/src/runtime/Config.alpha-os= f1 -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. -=20 --CFLAGS +=3D -Dosf1 -O0 -g -D_XOPEN_SOURCE=3D500 -D_OSF_SOURCE=3D500 --CFLAGS +=3D -msg_disable newlocale -+CFLAGS +=3D -Dosf1 -O0 -D_XOPEN_SOURCE=3D500 -D_OSF_SOURCE=3D500 -msg_d= isable newlocale - ASFLAGS +=3D -Dosf1 #-ULANGUAGE_ASSEMBLY - LD =3D ld -xtaso --LINKFLAGS =3D -non_shared # dynamic -v -g -Wl,-T -Wl,ld-script.alpha-= linux -+LDFLAGS +=3D -non_shared # dynamic -v -g -Wl,-T -Wl,ld-script.alpha-l= inux - # Digital^WCompaq^WHP's cc declares `static inline' functions to exist - # in multiple places in the binary; we add the '-g' flag to suppress al= l - # 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. -=20 --LINKFLAGS +=3D -v -+LDFLAGS +=3D -v - # avoid native tools - NM =3D /usr/local/bin/nm - CC =3D /usr/local/bin/gcc -diff --git a/src/runtime/Config.hppa-linux b/src/runtime/Config.hppa-lin= ux -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. -=20 --LINKFLAGS +=3D -v -static -+SBCL_LDFLAGS +=3D -v -static - NM =3D ./linux-nm -=20 - ASSEM_SRC =3D hppa-assem.S #hppa-linux-stubs.S -diff --git a/src/runtime/Config.mips-linux b/src/runtime/Config.mips-lin= ux -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. -=20 --LINKFLAGS +=3D -v -O2 -Wl,--export-dynamic -+SBCL_LDFLAGS +=3D -v -O2 -Wl,--export-dynamic - NM =3D ./linux-nm -=20 - ASSEM_SRC =3D mips-assem.S ldso-stubs.S -@@ -19,7 +19,7 @@ OS_SRC =3D linux-os.c mips-linux-os.c - OS_LIBS =3D -ldl -=20 - ifdef LISP_FEATURE_LARGEFILE -- CFLAGS +=3D -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_= BITS=3D64 -+ SBCL_CFLAGS +=3D -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OF= FSET_BITS=3D64 - endif -=20 - ifdef LISP_FEATURE_SB_THREAD -diff --git a/src/runtime/Config.ppc-darwin b/src/runtime/Config.ppc-darw= in -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. -=20 --CFLAGS =3D -g -Wall -O2 -fdollars-in-identifiers -mmacosx-version-min=3D= 10.4 --LINKFLAGS +=3D -mmacosx-version-min=3D10.4 -+CFLAGS +=3D -O2 -fdollars-in-identifiers -mmacosx-version-min=3D10.4 -+LDFLAGS +=3D -mmacosx-version-min=3D10.4 -=20 - OS_SRC =3D bsd-os.c darwin-os.c ppc-darwin-os.c -=20 -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. -=20 --CFLAGS =3D -g --LINKFLAGS +=3D -v -rdynamic -+SBCL_LDFLAGS +=3D -v -rdynamic - NM =3D ./linux-nm -=20 - ASSEM_SRC =3D ppc-assem.S ldso-stubs.S -diff --git a/src/runtime/Config.ppc-netbsd b/src/runtime/Config.ppc-netb= sd -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. -=20 --LINKFLAGS +=3D -dynamic -export-dynamic --CFLAGS =3D -g -Wall -O2 -+LDFLAGS +=3D -dynamic -export-dynamic -+CFLAGS +=3D -O2 -=20 - ASSEM_SRC =3D ppc-assem.S ldso-stubs.S - ARCH_SRC =3D ppc-arch.c -diff --git a/src/runtime/Config.sparc-linux b/src/runtime/Config.sparc-l= inux -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. -=20 --ASFLAGS =3D -g -Wall --LINKFLAGS +=3D -v -rdynamic -+SBCL_LDFLAGS +=3D -v -rdynamic - NM =3D ./linux-nm -=20 - ASSEM_SRC =3D 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. -=20 - CC =3D gcc --CFLAGS +=3D -g -Wall -O2 --LINKFLAGS +=3D -v -+CFLAGS +=3D -O2 -+LDFLAGS +=3D -v - NM =3D nm -t x -p -=20 - ASSEM_SRC =3D sparc-assem.S ldso-stubs.S -diff --git a/src/runtime/Config.sparc-sunos b/src/runtime/Config.sparc-s= unos -index c5c89b8..7ca56e8 100644 ---- a/src/runtime/Config.sparc-sunos -+++ b/src/runtime/Config.sparc-sunos -@@ -11,8 +11,8 @@ -=20 - CC =3D gcc - CFLAGS +=3D -DSVR4 -D_REENTRANT --ASFLAGS =3D -g -Wall -DSVR4 --LINKFLAGS +=3D -v -+ASFLAGS +=3D -DSVR4 -+LDFLAGS +=3D -v - NM =3D nm -t x -p=20 -=20 - ASSEM_SRC =3D sparc-assem.S ldso-stubs.S -diff --git a/src/runtime/Config.x86-64-darwin b/src/runtime/Config.x86-6= 4-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. -=20 --CFLAGS =3D -g -Wall -O2 -fdollars-in-identifiers -+CFLAGS +=3D -arch x86_64 -O2 -fdollars-in-identifier -+LDFLAGS +=3D -arch x86_64 -+ - ifdef LISP_FEATURE_DARWIN9_OR_BETTER - CFLAGS +=3D -mmacosx-version-min=3D10.5 --LINKFLAGS +=3D -mmacosx-version-min=3D10.5 -+LDFLAGS +=3D -mmacosx-version-min=3D10.5 - else - CFLAGS +=3D -mmacosx-version-min=3D10.4 --LINKFLAGS +=3D -mmacosx-version-min=3D10.4 -+LDFLAGS +=3D -mmacosx-version-min=3D10.4 - endif - ifdef LISP_FEATURE_INODE64 - CFLAGS +=3D -D_DARWIN_USE_64_BIT_INODE -@@ -31,9 +33,9 @@ endif - ASSEM_SRC =3D x86-64-assem.S ldso-stubs.S - ARCH_SRC =3D x86-64-arch.c -=20 --LINKFLAGS +=3D -arch x86_64 -dynamic -twolevel_namespace -bind_at_load = -pagezero_size 0x100000 -+LDFLAGS +=3D -dynamic -twolevel_namespace -bind_at_load -pagezero_size = 0x100000 -=20 --CFLAGS +=3D -arch x86_64 -fno-omit-frame-pointer -pagezero_size 0x10000= 0 -+CFLAGS +=3D -fno-omit-frame-pointer -pagezero_size 0x100000 -=20 - GC_SRC =3D gencgc.c -=20 -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 -=20 - ASSEM_SRC +=3D ldso-stubs.S -=20 --# Until sbcl-0.6.7.3, we used "LINKFLAGS+=3D-static" here, which -+# Until sbcl-0.6.7.3, we used "LDFLAGS+=3D-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 +=3D -dynamic -export-dynamic -+LDFLAGS +=3D -dynamic -export-dynamic -=20 - # 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-6= 4-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 +=3D ldso-stubs.S - OS_LIBS +=3D -lutil -=20 --# 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 +=3D -export-dynamic - LDFLAGS +=3D -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 +=3D ldso-stubs.S - OS_LIBS +=3D -lutil -=20 --# 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 +=3D -export-dynamic - LDFLAGS +=3D -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=3Dgcc --CFLAGS =3D -m64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=3D19950= 6L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer --ASFLAGS =3D -m64 -Wall -+CFLAGS +=3D -m64 -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=3D199506L -DSVR= 4 -D_REENTRANT -fno-omit-frame-pointer -+ASFLAGS +=3D -m64 - LD =3D ld --LINKFLAGS =3D -m64 -g -+LDFLAGS +=3D -m64 -g - NM =3D nm -xgp - GREP =3D ggrep -=20 - #CC=3D/opt/SunStudioExpress/bin/cc --#CFLAGS =3D -xarch=3Dgeneric64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C= _SOURCE=3D199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer --#ASFLAGS =3D -xarch=3Dgeneric64 -Wall -+#CFLAGS +=3D -xarch=3Dgeneric64 -g -O2 -D__EXTENSIONS__ -D_POSIX_C_SOUR= CE=3D199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer -+#ASFLAGS +=3D -xarch=3Dgeneric64 -=20 - ASSEM_SRC =3D x86-64-assem.S ldso-stubs.S - ARCH_SRC =3D x86-64-arch.c -diff --git a/src/runtime/Config.x86-darwin b/src/runtime/Config.x86-darw= in -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. -=20 --CFLAGS =3D -arch i386 -g -Wall -O2 -fdollars-in-identifiers -fno-omit-f= rame-pointer --LINKFLAGS +=3D -arch i386 -+SBCL_CFLAGS +=3D -arch i386 -O2 -fdollars-in-identifiers -fno-omit-fram= e-pointer -+SBCL_LDFLAGS +=3D -arch i386 - ifdef LISP_FEATURE_DARWIN9_OR_BETTER --CFLAGS +=3D -mmacosx-version-min=3D10.5 --LINKFLAGS +=3D -mmacosx-version-min=3D10.5 -+SBCL_CFLAGS +=3D -mmacosx-version-min=3D10.5 -+SBCL_LDFLAGS +=3D -mmacosx-version-min=3D10.5 - else --CFLAGS +=3D -mmacosx-version-min=3D10.4 --LINKFLAGS +=3D -mmacosx-version-min=3D10.4 -+SBCL_CFLAGS +=3D -mmacosx-version-min=3D10.4 -+SBCL_LDFLAGS +=3D -mmacosx-version-min=3D10.4 - endif -=20 - OS_SRC =3D bsd-os.c x86-bsd-os.c darwin-os.c x86-darwin-os.c -@@ -31,7 +31,7 @@ CC =3D gcc - ASSEM_SRC =3D x86-assem.S ldso-stubs.S - ARCH_SRC =3D x86-arch.c -=20 --CPPFLAGS +=3D -no-cpp-precomp -+SBCL_CPPFLAGS +=3D -no-cpp-precomp -=20 - GC_SRC =3D gencgc.c -=20 -diff --git a/src/runtime/Config.x86-freebsd b/src/runtime/Config.x86-fre= ebsd -index a30afdc..497334f 100644 ---- a/src/runtime/Config.x86-freebsd -+++ b/src/runtime/Config.x86-freebsd -@@ -13,11 +13,11 @@ include Config.x86-bsd -=20 - ASSEM_SRC +=3D ldso-stubs.S -=20 --# Until sbcl-0.6.7.3, we used "LINKFLAGS+=3D-static" here, which -+# Until sbcl-0.6.7.3, we used "LDFLAGS+=3D-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 +=3D -dynamic -export-dynamic -+LDFLAGS +=3D -dynamic -export-dynamic -=20 - # 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 =3D 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 +=3D -Wl,--export-dynamic -m32 -+SBCL_LDFLAGS +=3D -Wl,--export-dynamic -m32 - OS_LIBS =3D -ldl -=20 - ifdef LISP_FEATURE_LARGEFILE -- CFLAGS +=3D -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_= BITS=3D64 -+ SBCL_CFLAGS +=3D -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OF= FSET_BITS=3D64 - endif --CFLAGS +=3D -m32 -fno-omit-frame-pointer -+SBCL_CFLAGS +=3D -m32 -fno-omit-frame-pointer -=20 - ifdef LISP_FEATURE_SB_THREAD - OS_LIBS +=3D -lpthread -diff --git a/src/runtime/Config.x86-netbsd b/src/runtime/Config.x86-netb= sd -index b101bd1..53ff180 100644 ---- a/src/runtime/Config.x86-netbsd -+++ b/src/runtime/Config.x86-netbsd -@@ -13,6 +13,6 @@ include Config.x86-bsd -=20 - ASSEM_SRC +=3D ldso-stubs.S - OS_SRC +=3D undefineds.c --LINKFLAGS +=3D -dynamic -export-dynamic -+SBCL_LDFLAGS +=3D -dynamic -export-dynamic -=20 --CFLAGS =3D -g -Wall -O2 -fno-omit-frame-pointer -+SBCL_CFLAGS =3D -O2 -fno-omit-frame-pointer -diff --git a/src/runtime/Config.x86-openbsd b/src/runtime/Config.x86-ope= nbsd -index 144cc2b..fc4a17e 100644 ---- a/src/runtime/Config.x86-openbsd -+++ b/src/runtime/Config.x86-openbsd -@@ -18,11 +18,6 @@ OS_LIBS +=3D -lutil - # locations used. If you wish to link the runtime using -Z option then - # please see the comments in src/compiler/x86/parms.lisp -=20 --# 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 +=3D -export-dynamic -=20 --LINKFLAGS +=3D -export-dynamic --LDFLAGS +=3D -export-dynamic -- --CFLAGS =3D -g -Wall -O2 -fno-omit-frame-pointer -+SBCL_CFLAGS +=3D -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. -=20 - CC=3Dgcc --CFLAGS =3D -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=3D199506L -D= SVR4 -D_REENTRANT -fno-omit-frame-pointer --ASFLAGS =3D -Wall -+SBCL_CFLAGS +=3D -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=3D199506L -DSVR= 4 -D_REENTRANT -fno-omit-frame-pointer -+SBCL_ASFLAGS +=3D -Wall - LD =3D ld - NM =3D nm -xgp - GREP =3D 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 =3D 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 +=3D -Wl,--export-dynamic -+LDFLAGS +=3D -Wl,--export-dynamic - OS_LIBS =3D -ldl -=20 - ifdef LISP_FEATURE_LARGEFILE -- CFLAGS +=3D -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_= BITS=3D64 -+ SBCL_CFLAGS +=3D -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OF= FSET_BITS=3D64 - endif -=20 - ifdef LISP_FEATURE_SB_THREAD - OS_LIBS +=3D -lpthread - endif -=20 --CFLAGS +=3D -fno-omit-frame-pointer -+SBCL_CFLAGS +=3D -fno-omit-frame-pointer -=20 - GC_SRC =3D gencgc.c -=20 -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=3Dsbcl - # 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 =3D ld --LINKFLAGS =3D -g -+SBCL_LDFLAGS =3D -g - NM =3D nm -gp - DEPEND_FLAGS =3D -MM - GREP =3D grep -=20 - include ../../output/prefix.def -=20 --CFLAGS =3D -g -Wall -Wsign-compare -O3 --ASFLAGS =3D $(CFLAGS) --CPPFLAGS =3D -I. -DSBCL_PREFIX=3D\"$(SBCL_PREFIX)\" -+SBCL_CFLAGS =3D -g -Wall -Wsign-compare -O3 -+SBCL_ASFLAGS =3D $(SBCL_CFLAGS) -+SBCL_CPPFLAGS =3D -I. -DSBCL_PREFIX=3D\"$(SBCL_PREFIX)\" -=20 --# 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 -=20 - COMMON_SRC =3D 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 =3D ${OS_LIBS} -lm - targets: $(TARGET) sbcl.nm -=20 - $(TARGET): $(OBJS) -- $(CC) ${LINKFLAGS} -o $@ $^ $(LIBS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -=20 - 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 :=3D $(SBCL_CPPFLAGS) $(CPPFLAGS) -+CFLAGS :=3D $(SBCL_CFLAGS) $(CFLAGS) -+ASFLAGS :=3D $(SBCL_ASFLAGS) $(ASFLAGS) -+LDFLAGS :=3D $(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. -=20 ---include genesis/Makefile.features ---include Config -+SBCL_CPPFLAGS =3D -I../src/runtime -+SBCL_LDFLAGS =3D $(OS_LIBS) -=20 --CPPFLAGS:=3D-I../src/runtime --LDFLAGS:=3D$(LDFLAGS) --LDLIBS:=3D$(OS_LIBS) -+# from src/runtime/ -+-include platform.mk -=20 - 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() { } =20 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 =20