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 1Qx5hX-0006CD-Ak for garchives@archives.gentoo.org; Fri, 26 Aug 2011 23:20:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5978421C177; Fri, 26 Aug 2011 23:20:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C0F6C21C177 for ; Fri, 26 Aug 2011 23:20:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F83C1B403B for ; Fri, 26 Aug 2011 23:20:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0659C80040 for ; Fri, 26 Aug 2011 23:20:29 +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.50-fix-linux-kernel-version-parsing.patch dev-lisp/sbcl/files/1.0.50-gentoo-fix_build_system.patch dev-lisp/sbcl/files/1.0.51-gentoo-fix_build_system.patch dev-lisp/sbcl/sbcl-1.0.51.ebuild X-VCS-Directories: dev-lisp/sbcl/ dev-lisp/sbcl/files/ X-VCS-Committer: fenlix X-VCS-Committer-Name: Stelian Ionescu X-VCS-Revision: b4f30c95c4e8af9b3be3a151ef7f2c3564011d20 Date: Fri, 26 Aug 2011 23:20:29 +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: X-Archives-Hash: e5bd00129a75d731782f2a35e202c432 commit: b4f30c95c4e8af9b3be3a151ef7f2c3564011d20 Author: Stelian Ionescu cddr org> AuthorDate: Fri Aug 26 23:20:21 2011 +0000 Commit: Stelian Ionescu cddr org> CommitDate: Fri Aug 26 23:20:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/lisp.git;a=3D= commit;h=3Db4f30c95 dev-lisp/sbcl: fix build system --- .../1.0.50-fix-linux-kernel-version-parsing.patch | 38 -- ....patch =3D> 1.0.51-gentoo-fix_build_system.patch} | 359 +++++++++++-= -------- dev-lisp/sbcl/sbcl-1.0.51.ebuild | 1 - 3 files changed, 203 insertions(+), 195 deletions(-) diff --git a/dev-lisp/sbcl/files/1.0.50-fix-linux-kernel-version-parsing.= patch b/dev-lisp/sbcl/files/1.0.50-fix-linux-kernel-version-parsing.patch deleted file mode 100644 index cf3746a..0000000 --- a/dev-lisp/sbcl/files/1.0.50-fix-linux-kernel-version-parsing.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit b43c51beeb0569a38900e1e5a78606711f987742 -Author: Paul Khuong -Date: Wed Aug 3 10:20:41 2011 -0400 - - Fix version string parsing for Linux 3.0 - =20 - Stop assuming the presence of minor and patch version numbers; miss= ing - values are defaulted to 0 (e.g. 3.0.0). - =20 - 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=3Dname.release; - major_version =3D atoi(p); -- p=3Dstrchr(p,'.')+1; -- minor_version =3D atoi(p); -- p=3Dstrchr(p,'.')+1; -- patch_version =3D atoi(p); -+ minor_version =3D patch_version =3D 0; -+ p=3Dstrchr(p,'.'); -+ if (p !=3D NULL) { -+ minor_version =3D atoi(++p); -+ p=3Dstrchr(p,'.'); -+ if (p !=3D NULL) -+ patch_version =3D atoi(++p); -+ } -+ - if (major_version<2) { - lose("linux kernel version too old: major version=3D%d (can't r= un in version < 2.0.0)\n", - major_version); diff --git a/dev-lisp/sbcl/files/1.0.50-gentoo-fix_build_system.patch b/d= ev-lisp/sbcl/files/1.0.51-gentoo-fix_build_system.patch similarity index 55% rename from dev-lisp/sbcl/files/1.0.50-gentoo-fix_build_system.patch rename to dev-lisp/sbcl/files/1.0.51-gentoo-fix_build_system.patch index fbfcff2..f3dbbc7 100644 --- a/dev-lisp/sbcl/files/1.0.50-gentoo-fix_build_system.patch +++ b/dev-lisp/sbcl/files/1.0.51-gentoo-fix_build_system.patch @@ -1,13 +1,14 @@ -diff -Naur sbcl-1.0.49.orig/contrib/asdf-module.mk sbcl-1.0.49/contrib/a= sdf-module.mk ---- sbcl-1.0.49.orig/contrib/asdf-module.mk 2011-06-05 21:35:33.00000000= 0 +0200 -+++ sbcl-1.0.49/contrib/asdf-module.mk 2011-06-08 17:50:43.402210614 +02= 00 +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 @@ +@@ -7,6 +9,9 @@ CC=3Dgcc # directly via ASDF from a non-C-aware module which has these tricky # ones as dependencies. =20 @@ -17,7 +18,7 @@ diff -Naur sbcl-1.0.49.orig/contrib/asdf-module.mk sbcl= -1.0.49/contrib/asdf-modu UNAME:=3D$(shell uname -s) =20 ifeq (SunOS,$(UNAME)) -@@ -23,7 +28,9 @@ +@@ -23,7 +28,9 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) CC:=3D$(shell cygpath -m $(shell readlink -fn $(shell which $(CC)))) endif =20 @@ -28,9 +29,10 @@ diff -Naur sbcl-1.0.49.orig/contrib/asdf-module.mk sbc= l-1.0.49/contrib/asdf-modu =20 all: $(EXTRA_ALL_TARGETS) $(MAKE) -C ../asdf -diff -Naur sbcl-1.0.49.orig/contrib/vanilla-module.mk sbcl-1.0.49/contri= b/vanilla-module.mk ---- sbcl-1.0.49.orig/contrib/vanilla-module.mk 2011-06-05 21:35:34.00000= 0000 +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 =20 $(MODULE).fasl: $(MODULE).lisp ../../output/sbcl.core $(SBCL) --eval '(compile-file (format nil "SYS:CONTRIB;~:@(~A~);~:@(~A= ~).LISP" "$(MODULE)" "$(MODULE)"))' ,$@ -diff -Naur sbcl-1.0.49.orig/src/runtime/platform.mk sbcl-1.0.49/src/runt= ime/platform.mk ---- sbcl-1.0.49.orig/src/runtime/platform.mk 1970-01-01 01:00:00.0000000= 00 +0100 -+++ sbcl-1.0.49/src/runtime/platform.mk 2011-06-08 17:50:43.428877162 +0= 200 +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 :=3D $(SBCL_CFLAGS) $(CFLAGS) +ASFLAGS :=3D $(SBCL_ASFLAGS) $(ASFLAGS) +LDFLAGS :=3D $(SBCL_LDFLAGS) $(LDFLAGS) -diff -Naur sbcl-1.0.49.orig/tools-for-build/Makefile sbcl-1.0.49/tools-f= or-build/Makefile ---- sbcl-1.0.49.orig/tools-for-build/Makefile 2011-06-05 21:35:35.000000= 000 +0200 -+++ sbcl-1.0.49/tools-for-build/Makefile 2011-06-08 17:50:43.428877162 += 0200 +diff --git a/tools-for-build/Makefile b/tools-for-build/Makefile +index 7a4c16f..dc99ebc 100644 +--- a/tools-for-build/Makefile ++++ b/tools-for-build/Makefile @@ -7,12 +7,11 @@ # provided with absolutely no warranty. See the COPYING and CREDITS # files for more information. diff --git a/dev-lisp/sbcl/sbcl-1.0.51.ebuild b/dev-lisp/sbcl/sbcl-1.0.51= .ebuild index ccc2eda..4c47165 100644 --- a/dev-lisp/sbcl/sbcl-1.0.51.ebuild +++ b/dev-lisp/sbcl/sbcl-1.0.51.ebuild @@ -77,7 +77,6 @@ src_unpack() { =20 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 =20