[arch-commits] Commit in cmucl/repos/extra-i686 (3 files)

Mon Feb 20 23:34:53 UTC 2012

Date: Monday, February 20, 2012 @ 18:34:53
  Author: juergen
Revision: 150711

archrelease: copy trunk to extra-i686

Added:
  cmucl/repos/extra-i686/PKGBUILD
    (from rev 150710, cmucl/trunk/PKGBUILD)
  cmucl/repos/extra-i686/workaround-for-gcc-4.6-overoptimization
    (from rev 150710, cmucl/trunk/workaround-for-gcc-4.6-overoptimization)
Deleted:
  cmucl/repos/extra-i686/PKGBUILD

-----------------------------------------+
 PKGBUILD                                |  126 +++++++++++++++---------------
 workaround-for-gcc-4.6-overoptimization |   19 ++++
 2 files changed, 84 insertions(+), 61 deletions(-)

Deleted: PKGBUILD
===================================================================

--- PKGBUILD	2012-02-20 23:34:00 UTC (rev 150710)
+++ PKGBUILD	2012-02-20 23:34:53 UTC (rev 150711)
@@ -1,61 +0,0 @@
-# $Id$
-# Contributor: John Proctor <jproctor at prium.net>
-# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
-
-pkgname=cmucl
-pkgver=20a
-pkgrel=2
-pkgdesc="CMU Common Lisp"
-depends=('glibc' 'lesstif')
-provides=('common-lisp')
-makedepends=('sed' 'bc')
-license=('custom')
-#license PublicDomain
-source=(http://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-src-${pkgver}.tar.bz2 \
-    http://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-${pkgver}-x86-linux.tar.bz2)
-md5sums=('e3e1daa3631d38ed3c3e7601d798aba1' 'bfc6eb859c9219d8e7b00796c69e504c')
-url="http://www.cons.org/cmucl/"
-arch=(i686)
-
-build() {
-  cd ${srcdir}
-  export CMUCLCORE=${srcdir}/lib/cmucl/lib/lisp-x87.core
-  # Create target buildroot
-  ./src/tools/create-target.sh $CHOST 
-  # Use binary-dist lisp to create initial kernel.core
-  ./src/tools/build-world.sh $CHOST ${srcdir}/bin/lisp
-  # build native lisp binary
-  ./src/tools/rebuild-lisp.sh $CHOST 
-  # Generate lisp.core
-  ./src/tools/load-world.sh $CHOST  ${pkgver}
-  # rebuild kernel.core using native lisp 
-  ./src/tools/build-world.sh $CHOST $CHOST/lisp/lisp
-  # "(Re)generate lisp.core"
-  ./src/tools/load-world.sh $CHOST ${pkgver} 
-  # Build auxilary stuff
-  ./src/tools/build-utils.sh $CHOST 
-  # make new binary dist archives
-  ./src/tools/make-dist.sh $CHOST ${pkgver} x86 linux
-  
-  mkdir -p ${pkgdir}/usr/lib/cmucl/
-  mkdir -p ${pkgdir}/usr/share/man/man1
-  mkdir dist
-  tar xjf cmucl-${pkgver}-x86-linux.tar.bz2 -C dist 
-  tar xjf cmucl-${pkgver}-x86-linux.extra.tar.bz2 -C dist
-  cp -a dist/bin ${pkgdir}/usr/lib/cmucl
-  cp -a dist/lib/cmucl ${pkgdir}/usr/lib/ 
-  cp -a dist/man/man1/* ${pkgdir}/usr/share/man/man1/
-
-  ## Setup app-wrapper
-  install -m755 -p -D lib/cmucl/sample-wrapper ${pkgdir}/usr/bin/cmucl
-  # Fixup paths in wrapper
-  sed -i -e "s|^CMUCLLIB=.*|CMUCLLIB=/usr/lib/cmucl/lib|" ${pkgdir}/usr/bin/cmucl
-  sed -i -e "s|/<<your-cmucl-path>>|/usr/lib/cmucl|"      ${pkgdir}/usr/bin/cmucl
-  # many apps (ie, maxima) expect to find the wrapper named 'lisp' too
-  ln -sf cmucl ${pkgdir}/usr/bin/lisp
-  ## Unpackaged files
-  rm -f ${pkgdir}/usr/lib/cmucl/sample-wrapper
-  # license
-  install -D -m644 ${srcdir}/src/general-info/COPYRIGHTS \
-                   ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-}

Copied: cmucl/repos/extra-i686/PKGBUILD (from rev 150710, cmucl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2012-02-20 23:34:53 UTC (rev 150711)
@@ -0,0 +1,65 @@
+# $Id$
+# Contributor: John Proctor <jproctor at prium.net>
+# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
+
+pkgname=cmucl
+pkgver=20c
+pkgrel=1
+pkgdesc="CMU Common Lisp"
+depends=('glibc' 'lesstif')
+provides=('common-lisp')
+makedepends=('sed' 'bc')
+license=('custom')
+#license PublicDomain
+source=(http://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-src-${pkgver}.tar.bz2 \
+  http://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-${pkgver}-x86-linux.tar.bz2 \
+  workaround-for-gcc-4.6-overoptimization)
+md5sums=('7eec1ddbd281261e2b08194859727e9a'
+         'c200365b631c7b36b7675e4fc6e17177'
+         '02dd46e8b4b966d121a15037c713f6d4')
+url="http://www.cons.org/cmucl/"
+arch=(i686)
+
+build() {
+  cd ${srcdir}
+  patch -Np1 -i workaround-for-gcc-4.6-overoptimization
+  export CMUCLCORE=${srcdir}/lib/cmucl/lib/lisp-x87.core
+  # Create target buildroot
+  ./src/tools/create-target.sh $CHOST 
+  # Use binary-dist lisp to create initial kernel.core
+  ./src/tools/build-world.sh $CHOST ${srcdir}/bin/lisp
+  # build native lisp binary
+  ./src/tools/rebuild-lisp.sh $CHOST 
+  # Generate lisp.core
+  ./src/tools/load-world.sh $CHOST  ${pkgver}
+  # rebuild kernel.core using native lisp 
+  ./src/tools/build-world.sh $CHOST $CHOST/lisp/lisp
+  # "(Re)generate lisp.core"
+  ./src/tools/load-world.sh $CHOST ${pkgver} 
+  # Build auxilary stuff
+  ./src/tools/build-utils.sh $CHOST 
+  # make new binary dist archives
+  ./src/tools/make-dist.sh $CHOST ${pkgver} x86 linux
+  
+  mkdir -p ${pkgdir}/usr/lib/cmucl/
+  mkdir -p ${pkgdir}/usr/share/man/man1
+  mkdir dist
+  tar xjf cmucl-${pkgver}-x86-linux.tar.bz2 -C dist 
+  tar xjf cmucl-${pkgver}-x86-linux.extra.tar.bz2 -C dist
+  cp -a dist/bin ${pkgdir}/usr/lib/cmucl
+  cp -a dist/lib/cmucl ${pkgdir}/usr/lib/ 
+  cp -a dist/man/man1/* ${pkgdir}/usr/share/man/man1/
+
+  ## Setup app-wrapper
+  install -m755 -p -D lib/cmucl/sample-wrapper ${pkgdir}/usr/bin/cmucl
+  # Fixup paths in wrapper
+  sed -i -e "s|^CMUCLLIB=.*|CMUCLLIB=/usr/lib/cmucl/lib|" ${pkgdir}/usr/bin/cmucl
+  sed -i -e "s|/<<your-cmucl-path>>|/usr/lib/cmucl|"      ${pkgdir}/usr/bin/cmucl
+  # many apps (ie, maxima) expect to find the wrapper named 'lisp' too
+  ln -sf cmucl ${pkgdir}/usr/bin/lisp
+  ## Unpackaged files
+  rm -f ${pkgdir}/usr/lib/cmucl/sample-wrapper
+  # license
+  install -D -m644 ${srcdir}/src/general-info/COPYRIGHTS \
+                   ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
+}

Copied: cmucl/repos/extra-i686/workaround-for-gcc-4.6-overoptimization (from rev 150710, cmucl/trunk/workaround-for-gcc-4.6-overoptimization)
===================================================================
--- workaround-for-gcc-4.6-overoptimization	                        (rev 0)
+++ workaround-for-gcc-4.6-overoptimization	2012-02-20 23:34:53 UTC (rev 150711)
@@ -0,0 +1,19 @@
+Description: GCC 4.6 optimizes away the direction of stack testing, so do it by hand
+Author: Peter Van Eynde <pvaneynd at debian.org>
+Forwarded: Done
+
+
+Index: cmucl/src/lisp/os-common.c
+===================================================================
+--- cmucl.orig/src/lisp/os-common.c	2012-01-16 13:29:48.716895926 +0000
++++ cmucl/src/lisp/os-common.c	2012-01-16 13:30:42.855951009 +0000
+@@ -383,7 +383,8 @@
+ {
+     int dummy;
+ 
+-    return os_stack_grows_down_1(&dummy);
++    /* return os_stack_grows_down_1(&dummy); */
++    return 1;
+ }
+ 

+ 


