[arch-commits] Commit in sbcl/trunk (2 files)

[Dave Reisner]

    Date: Monday, September 5, 2011 @ 19:05:20
  Author: dreisner
Revision: 137075

upgpkg: sbcl 1.0.51-1

upstream release 1.0.51

Modified:
  sbcl/trunk/PKGBUILD
Deleted:
  sbcl/trunk/0001-Fix-version-string-parsing-for-Linux-3.0.patch

-----------------------------------------------------+
 0001-Fix-version-string-parsing-for-Linux-3.0.patch |   43 ------------------
 PKGBUILD                                            |   17 ++-----
 2 files changed, 6 insertions(+), 54 deletions(-)

Deleted: 0001-Fix-version-string-parsing-for-Linux-3.0.patch
===================================================================
--- 0001-Fix-version-string-parsing-for-Linux-3.0.patch	2011-09-05 22:00:23 UTC (rev 137074)
+++ 0001-Fix-version-string-parsing-for-Linux-3.0.patch	2011-09-05 23:05:20 UTC (rev 137075)
@@ -1,43 +0,0 @@
-From b43c51beeb0569a38900e1e5a78606711f987742 Mon Sep 17 00:00:00 2001
-From: Paul Khuong <pvk at pvk.ca>
-Date: Wed, 3 Aug 2011 10:20:41 -0400
-Subject: [PATCH] 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.
----
- src/runtime/linux-os.c |   14 ++++++++++----
- 1 files changed, 10 insertions(+), 4 deletions(-)
-
-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);
--- 
-1.7.6
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-05 22:00:23 UTC (rev 137074)
+++ PKGBUILD	2011-09-05 23:05:20 UTC (rev 137075)
@@ -5,8 +5,8 @@
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.0.50
-pkgrel=2
+pkgver=1.0.51
+pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
 arch=('i686' 'x86_64')
@@ -16,11 +16,9 @@
 makedepends=('sbcl' 'texinfo')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
-        "arch-fixes.lisp"
-        "0001-Fix-version-string-parsing-for-Linux-3.0.patch")
-md5sums=('74ce9b24516885d066ec4287cde52e8c'
-         '7ac0c1936547f4278198b8bf7725204d'
-         '7af58d1de2d788ad6a8d82c89279a75f')
+        "arch-fixes.lisp")
+md5sums=('08032cc777f1236953cb901e24775457'
+         '7ac0c1936547f4278198b8bf7725204d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -32,7 +30,7 @@
   export LINKFLAGS="$LDFLAGS"
   unset LDFLAGS
 
-  # Make a multi-threaded SBCL, disable LARGEFILE  
+  # Make a multi-threaded SBCL, disable LARGEFILE
   cat >customize-target-features.lisp <<EOF
 (lambda (features)
   (flet ((enable (x) (pushnew x features))
@@ -41,9 +39,6 @@
   (disable :largefile)))
 EOF
 
-  # fix build against 3.0-ARCH
-  patch -Np1 < "$srcdir/0001-Fix-version-string-parsing-for-Linux-3.0.patch"
-
   sh make.sh sbcl
   make -C doc/manual info
 }