[arch-commits] Commit in sbcl/repos (6 files)
Juergen Hoetzel
juergen at archlinux.org
Wed Sep 9 19:41:12 UTC 2009
Date: Wednesday, September 9, 2009 @ 15:41:11
Author: juergen
Revision: 51578
Merged revisions 51477-51479,51574,51577 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/sbcl/trunk
........
r51477 | juergen | 2009-09-08 21:17:55 +0200 (Di, 08 Sep 2009) | 1 line
Fix #11890 remove invalid/unused patch
........
r51478 | juergen | 2009-09-08 21:23:20 +0200 (Di, 08 Sep 2009) | 1 line
Fix #13902: sbcl provides cl-asdf
........
r51479 | juergen | 2009-09-08 22:42:21 +0200 (Di, 08 Sep 2009) | 1 line
get rid of SBCL_HOME patch (use CFLAGS)
........
r51574 | juergen | 2009-09-09 21:00:25 +0200 (Mi, 09 Sep 2009) | 1 line
removed orphan profile file
........
r51577 | juergen | 2009-09-09 21:39:09 +0200 (Mi, 09 Sep 2009) | 1 line
Fix #13902: Invalid Source Path
........
Added:
sbcl/repos/extra-x86_64/fix-source-path.lisp
(from rev 51577, sbcl/trunk/fix-source-path.lisp)
Modified:
sbcl/repos/extra-x86_64/ (properties)
sbcl/repos/extra-x86_64/PKGBUILD
Deleted:
sbcl/repos/extra-x86_64/sbcl-default-sbcl-home.patch
sbcl/repos/extra-x86_64/sbcl-fix-source-path.patch
sbcl/repos/extra-x86_64/sbcl.profile
------------------------------+
PKGBUILD | 17 +++++++----------
fix-source-path.lisp | 22 ++++++++++++++++++++++
sbcl-default-sbcl-home.patch | 11 -----------
sbcl-fix-source-path.patch | 12 ------------
sbcl.profile | 1 -
5 files changed, 29 insertions(+), 34 deletions(-)
Property changes on: sbcl/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /sbcl/trunk:1-50937
+ /sbcl/trunk:1-51577
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-09-09 19:39:09 UTC (rev 51577)
+++ extra-x86_64/PKGBUILD 2009-09-09 19:41:11 UTC (rev 51578)
@@ -10,20 +10,18 @@
arch=(i686 x86_64)
license=('custom')
depends=('glibc')
-provides=('common-lisp')
+provides=('common-lisp' 'cl-asdf')
makedepends=('sbcl' 'texinfo')
-source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" \
- "sbcl-default-sbcl-home.patch" \
- "sbcl-fix-source-path.patch")
-md5sums=('a61fd099a72c2d3fa10a57298f3c9bf6' \
- '053ef3ab65501635406134382df17278' \
- '68562d971985eb418a767c16ad2e8526')
+source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "fix-source-path.lisp")
+md5sums=('a61fd099a72c2d3fa10a57298f3c9bf6' 'e0fb2483602d260ba602a0fbf37ae09f')
+
url="http://www.sbcl.org/"
install=sbcl.install
build() {
+ export CFLAGS="${CFLAGS} -DSBCL_HOME=\\\"/usr/lib/sbcl\\\""
+ export GNUMAKE="make -e"
cd ${startdir}/src/${pkgname}-${pkgver}
- patch -Np0 -i ../sbcl-default-sbcl-home.patch || return 1
# Make a multi-threaded SBCL
cat >customize-target-features.lisp <<EOF
(lambda (features)
@@ -39,8 +37,7 @@
popd
INSTALL_ROOT=${startdir}/pkg/usr sh install.sh
- ./src/runtime/sbcl --core output/sbcl.core --script \
- ${startdir}/sbcl-fix-source-path.lisp
+ src/runtime/sbcl --core output/sbcl.core --script ${startdir}/src/fix-source-path.lisp
mv sbcl-new.core ${startdir}/pkg/usr/lib/sbcl/sbcl.core
# sources
Copied: sbcl/repos/extra-x86_64/fix-source-path.lisp (from rev 51577, sbcl/trunk/fix-source-path.lisp)
===================================================================
--- extra-x86_64/fix-source-path.lisp (rev 0)
+++ extra-x86_64/fix-source-path.lisp 2009-09-09 19:41:11 UTC (rev 51578)
@@ -0,0 +1,22 @@
+(in-package "COMMON-LISP-USER")
+
+(let* ((parent (make-pathname :directory '(:absolute "usr" "share" "sbcl-source")))
+ (src
+ (merge-pathnames
+ (make-pathname :directory '(:relative "src" :wild-inferiors)
+ :name :wild :type :wild)
+ parent))
+ (contrib
+ (merge-pathnames
+ (make-pathname :directory '(:relative "contrib" :wild-inferiors)
+ :name :wild :type :wild)
+ parent)))
+ (setf (logical-pathname-translations "SYS")
+ `(("SYS:SRC;**;*.*.*" ,src)
+ ("SYS:CONTRIB;**;*.*.*" ,contrib))))
+
+(ignore-errors
+ (sb-ext:gc :full t)
+ (sb-ext:save-lisp-and-die "sbcl-new.core"))
+
+
Deleted: extra-x86_64/sbcl-default-sbcl-home.patch
===================================================================
--- extra-x86_64/sbcl-default-sbcl-home.patch 2009-09-09 19:39:09 UTC (rev 51577)
+++ extra-x86_64/sbcl-default-sbcl-home.patch 2009-09-09 19:41:11 UTC (rev 51578)
@@ -1,11 +0,0 @@
---- src/runtime/GNUmakefile.orig 2008-03-25 21:10:26.000000000 -0400
-+++ src/runtime/GNUmakefile 2008-03-25 21:10:39.000000000 -0400
-@@ -23,7 +23,7 @@
- DEPEND_FLAGS = -MM
- GREP = grep
-
--CFLAGS = -g -Wall -Wsign-compare -O3
-+CFLAGS = -g -Wall -Wsign-compare -O3 -DSBCL_HOME=\"/usr/lib/sbcl\"
- ASFLAGS = $(CFLAGS)
- CPPFLAGS = -I.
-
Deleted: extra-x86_64/sbcl-fix-source-path.patch
===================================================================
--- extra-x86_64/sbcl-fix-source-path.patch 2009-09-09 19:39:09 UTC (rev 51577)
+++ extra-x86_64/sbcl-fix-source-path.patch 2009-09-09 19:41:11 UTC (rev 51578)
@@ -1,12 +0,0 @@
-diff --git a/PKGBUILD b/PKGBUILD
-index 6ef9a0e..297b506 100644
---- a/PKGBUILD
-+++ b/PKGBUILD
-@@ -34,7 +34,38 @@ EOF
- popd
- INSTALL_ROOT=${startdir}/pkg/usr sh install.sh
-
-
-
-
-
Deleted: extra-x86_64/sbcl.profile
===================================================================
--- extra-x86_64/sbcl.profile 2009-09-09 19:39:09 UTC (rev 51577)
+++ extra-x86_64/sbcl.profile 2009-09-09 19:41:11 UTC (rev 51578)
@@ -1 +0,0 @@
-export SBCL_HOME=/usr/lib/sbcl
More information about the arch-commits
mailing list