[arch-commits] Commit in sbcl/trunk (2 files)
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 p...@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_version2) {
- 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
===
--- PKGBUILD2011-09-05 22:00:23 UTC (rev 137074)
+++ PKGBUILD2011-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
}
[arch-commits] Commit in sbcl/trunk (2 files)
Date: Saturday, August 13, 2011 @ 16:11:24
Author: dreisner
Revision: 135444
upgpkg: sbcl 1.0.50-2
rebuild with kernel version parsing patch from upstream
Added:
sbcl/trunk/0001-Fix-version-string-parsing-for-Linux-3.0.patch
Modified:
sbcl/trunk/PKGBUILD
-+
0001-Fix-version-string-parsing-for-Linux-3.0.patch | 43 +++
PKGBUILD| 69 +-
2 files changed, 78 insertions(+), 34 deletions(-)
Added: 0001-Fix-version-string-parsing-for-Linux-3.0.patch
===
--- 0001-Fix-version-string-parsing-for-Linux-3.0.patch
(rev 0)
+++ 0001-Fix-version-string-parsing-for-Linux-3.0.patch 2011-08-13 20:11:24 UTC
(rev 135444)
@@ -0,0 +1,43 @@
+From b43c51beeb0569a38900e1e5a78606711f987742 Mon Sep 17 00:00:00 2001
+From: Paul Khuong p...@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_version2) {
+ 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
===
--- PKGBUILD2011-08-13 17:34:50 UTC (rev 135443)
+++ PKGBUILD2011-08-13 20:11:24 UTC (rev 135444)
@@ -2,31 +2,36 @@
# Contributor: John Proctor jproc...@prium.net
# Contributor: Daniel White dan...@whitehouse.id.au
# Maintainer: Juergen Hoetzel juer...@archlinux.org
-# Contributor: Leslie Polzer (skypher)
+# Contributor: Leslie Polzer (skypher)
pkgname=sbcl
pkgver=1.0.50
-pkgrel=1
+pkgrel=2
pkgdesc=Steel Bank Common Lisp
+url=http://www.sbcl.org/;
arch=('i686' 'x86_64')
license=('custom')
depends=('glibc')
provides=('common-lisp' 'cl-asdf')
makedepends=('sbcl' 'texinfo')
-source=(http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2;
arch-fixes.lisp)
+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')
-url=http://www.sbcl.org/;
-install=sbcl.install
+ '7ac0c1936547f4278198b8bf7725204d'
+ '7af58d1de2d788ad6a8d82c89279a75f')
build() {
- export CFLAGS=${CFLAGS} -DSBCL_HOME=\\\/usr/lib/sbcl\\\
+ cd $srcdir/$pkgname-$pkgver
+
+ export CFLAGS+= -DSBCL_HOME=\\\/usr/lib/sbcl\\\
export GNUMAKE=make -e
# build system uses LINKFLAGS and OS_LIBS to build LDFLAGS
- export LINKFLAGS=$LD_FLAGS
+ export LINKFLAGS=$LDFLAGS
unset LDFLAGS
- cd ${startdir}/src/${pkgname}-${pkgver}
+
# Make a multi-threaded SBCL, disable LARGEFILE
cat customize-target-features.lisp EOF
(lambda (features)
@@ -36,38 +41,34 @@
(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
- mkdir -p ${startdir}/pkg/usr
- pushd doc/manual
- make info || return 1
- popd
- INSTALL_ROOT=${startdir}/pkg/usr sh install.sh
+ make -C doc/manual info
+}
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ INSTALL_ROOT=$pkgdir/usr sh install.sh
+
src/runtime/sbcl --core output/sbcl.core --script
${startdir}/src/arch-fixes.lisp
mv sbcl-new.core ${startdir}/pkg/usr/lib/sbcl/sbcl.core
-# sources
- mkdir -p ${startdir}/pkg/usr/share/sbcl-source
- cp -R -t ${startdir}/pkg/usr/share/sbcl-source \
-${startdir}/src/${pkgname}-${pkgver}/{src,contrib}
+ # sources
+ mkdir -p $pkgdir/usr/share/sbcl-source
+ cp -R -t $pkgdir/usr/share/sbcl-source
$srcdir/$pkgname-$pkgver/{src,contrib}
-# drop unwanted files
- find ${startdir}/pkg/usr/share/sbcl-source -type f \
--name \*.fasl -or \
--name \*.o -or \
--name \*.log -or \
--name \*.so -or \
--name a.out -delete
+ #
