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

Juergen Hoetzel juergen at archlinux.org
Thu Jan 7 23:38:11 UTC 2010


    Date: Thursday, January 7, 2010 @ 18:38:11
  Author: juergen
Revision: 62395

Merged revisions 60241,60344,62030,62394 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/sbcl/trunk

........
  r60241 | juergen | 2009-12-02 15:16:27 +0100 (Mi, 02 Dez 2009) | 1 line
  
  fix FS#16761 - [sbcl] ships with debugger disabled by default
........
  r60344 | juergen | 2009-12-03 17:53:58 +0100 (Do, 03 Dez 2009) | 2 lines
  
  update to 1.0.33-1 (enables debugger)
........
  r62030 | juergen | 2009-12-30 23:33:33 +0100 (Mi, 30 Dez 2009) | 2 lines
  
  update to 1.0.34
........
  r62394 | juergen | 2010-01-08 00:37:08 +0100 (Fr, 08 Jan 2010) | 1 line
  
  fix missing libs (libdl) when using makepkg.conf provided LDFLAGS
........

Added:
  sbcl/repos/extra-x86_64/arch-fixes.lisp
    (from rev 62394, sbcl/trunk/arch-fixes.lisp)
Modified:
  sbcl/repos/extra-x86_64/	(properties)
  sbcl/repos/extra-x86_64/PKGBUILD
Deleted:
  sbcl/repos/extra-x86_64/fix-source-path.lisp

----------------------+
 PKGBUILD             |   15 ++++++++++-----
 arch-fixes.lisp      |   21 +++++++++++++++++++++
 fix-source-path.lisp |   22 ----------------------
 3 files changed, 31 insertions(+), 27 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-01-07 23:37:08 UTC (rev 62394)
+++ extra-x86_64/PKGBUILD	2010-01-07 23:38:11 UTC (rev 62395)
@@ -2,18 +2,19 @@
 # Contributor: John Proctor <jproctor at prium.net>
 # Contributor: Daniel White <daniel at whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Leslie Polzer (skypher) 
 
 pkgname=sbcl
-pkgver=1.0.31
-pkgrel=2
+pkgver=1.0.34
+pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 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" "fix-source-path.lisp")
-md5sums=('a61fd099a72c2d3fa10a57298f3c9bf6' 'e0fb2483602d260ba602a0fbf37ae09f')
+source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp")
+md5sums=('78c1a003281d11690f54609b4f5303f4' '7ac0c1936547f4278198b8bf7725204d')
 
 url="http://www.sbcl.org/"
 install=sbcl.install
@@ -21,6 +22,10 @@
 build() {
   export CFLAGS="${CFLAGS} -DSBCL_HOME=\\\"/usr/lib/sbcl\\\""
   export GNUMAKE="make -e"
+
+  # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS
+  export LINKFLAGS="$LD_FLAGS" 
+  unset LDFLAGS
   cd ${startdir}/src/${pkgname}-${pkgver}
   # Make a multi-threaded SBCL, disable LARGEFILE  
   cat >customize-target-features.lisp <<EOF
@@ -38,7 +43,7 @@
   popd 
   INSTALL_ROOT=${startdir}/pkg/usr sh install.sh
 
-  src/runtime/sbcl --core output/sbcl.core --script ${startdir}/src/fix-source-path.lisp
+  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

Copied: sbcl/repos/extra-x86_64/arch-fixes.lisp (from rev 62394, sbcl/trunk/arch-fixes.lisp)
===================================================================
--- extra-x86_64/arch-fixes.lisp	                        (rev 0)
+++ extra-x86_64/arch-fixes.lisp	2010-01-07 23:38:11 UTC (rev 62395)
@@ -0,0 +1,21 @@
+(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:enable-debugger)
+  (sb-ext:save-lisp-and-die "sbcl-new.core"))

Deleted: extra-x86_64/fix-source-path.lisp
===================================================================
--- extra-x86_64/fix-source-path.lisp	2010-01-07 23:37:08 UTC (rev 62394)
+++ extra-x86_64/fix-source-path.lisp	2010-01-07 23:38:11 UTC (rev 62395)
@@ -1,22 +0,0 @@
-(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"))
-
-




More information about the arch-commits mailing list