[arch-commits] Commit in sbcl/repos (3 files)

[Juergen Hoetzel]

    Date: Wednesday, March 18, 2009 @ 14:53:43
  Author: juergen
Revision: 30310

Merged revisions 29959,30239,30309 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/sbcl/trunk

........
  r29959 | juergen | 2009-03-14 23:16:31 +0100 (Sa, 14 M?\195?\164r 2009) | 1 line
  
  fix FS#11743
........
  r30239 | juergen | 2009-03-17 21:58:44 +0100 (Di, 17 M?\195?\164r 2009) | 1 line
  
  Include sbcl sources with a fixed system path
........
  r30309 | juergen | 2009-03-18 19:53:07 +0100 (Mi, 18 M?\195?\164r 2009) | 1 line
  
  upgpkg: sbcl 1.0.25-1
........

Added:
  sbcl/repos/extra-x86_64/sbcl-fix-source-path.patch
    (from rev 30309, sbcl/trunk/sbcl-fix-source-path.patch)
Modified:
  sbcl/repos/extra-x86_64/	(properties)
  sbcl/repos/extra-x86_64/PKGBUILD

----------------------------+
 PKGBUILD                   |   28 +++++++++++++++++++++++++---
 sbcl-fix-source-path.patch |   12 ++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)


Property changes on: sbcl/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /sbcl/trunk:1-25146
   + /sbcl/trunk:1-30309

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-18 18:53:07 UTC (rev 30309)
+++ extra-x86_64/PKGBUILD	2009-03-18 18:53:43 UTC (rev 30310)
@@ -1,17 +1,20 @@
 # $Id$
 # Contributor: John Proctor <jproctor at prium.net>
+# Contributor: Daniel White <daniel at whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org>
 
 pkgname=sbcl
-pkgver=1.0.24
+pkgver=1.0.25
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 arch=(i686 x86_64)
 license=('custom')
 depends=('glibc')
+provides=('common-lisp')
 makedepends=('sbcl' 'texinfo')
 source=("http://dl.sourceforge.net/sourceforge/sbcl/${pkgname}-${pkgver}-source.tar.bz2" \
-	"sbcl-default-sbcl-home.patch")
+  "sbcl-default-sbcl-home.patch" \
+  "sbcl-fix-source-path.lisp")
 md5sums=('7ac79e6e66121dc7bde881c67b88693f' '053ef3ab65501635406134382df17278')
 url="http://www.sbcl.org/"
 install=sbcl.install
@@ -34,7 +37,26 @@
   popd 
   INSTALL_ROOT=${startdir}/pkg/usr sh install.sh
 
-  # drop unwanted files
+  ./src/runtime/sbcl --core output/sbcl.core --script \
+    ${startdir}/sbcl-fix-source-path.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}
+
+# 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
+  
+  rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl
+  rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl.nm
+
   find ${startdir}/pkg \( -name Makefile -o -name .cvsignore \) -delete
 
   rm $startdir/pkg/usr/share/info/dir

Copied: sbcl/repos/extra-x86_64/sbcl-fix-source-path.patch (from rev 30309, sbcl/trunk/sbcl-fix-source-path.patch)
===================================================================
--- extra-x86_64/sbcl-fix-source-path.patch	                        (rev 0)
+++ extra-x86_64/sbcl-fix-source-path.patch	2009-03-18 18:53:43 UTC (rev 30310)
@@ -0,0 +1,12 @@
+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
+ 
+
+
+
+