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

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

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

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

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

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

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