Date: Tuesday, November 15, 2016 @ 20:21:14 Author: juergen Revision: 280862
archrelease: copy trunk to extra-i686 Added: cmucl/repos/extra-i686/PKGBUILD (from rev 280861, cmucl/trunk/PKGBUILD) cmucl/repos/extra-i686/workaround-for-gcc-4.6-overoptimization (from rev 280861, cmucl/trunk/workaround-for-gcc-4.6-overoptimization) Deleted: cmucl/repos/extra-i686/PKGBUILD cmucl/repos/extra-i686/workaround-for-gcc-4.6-overoptimization -----------------------------------------+ PKGBUILD | 104 +++++++++++++++--------------- workaround-for-gcc-4.6-overoptimization | 38 +++++----- 2 files changed, 73 insertions(+), 69 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2016-11-15 20:21:04 UTC (rev 280861) +++ PKGBUILD 2016-11-15 20:21:14 UTC (rev 280862) @@ -1,50 +0,0 @@ -# Contributor: John Proctor <jproc...@prium.net> -# Contributor: Alain Kalker <a.c.kal...@gmail.com> -# Maintainer: Juergen Hoetzel <juer...@archlinux.org> - -pkgname=cmucl -pkgver=21a -pkgrel=1 -pkgdesc="CMU Common Lisp" -depends_i686=('glibc' 'lesstif') -depends_x86_64=('lib32-glibc' 'lesstif') -provides=('common-lisp') -makedepends=('sed' 'bc') -license=('custom') -#license PublicDomain -source=("https://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-src-${pkgver}.tar.bz2" - "https://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-${pkgver}-x86-linux.tar.bz2") - -sha256sums=('41604a4f828a134dbf8a58623f45bd81b76ae05fc5c4cea5ccb74edfdc9e3167' - '02d00c025723e7a2fa7a44e43d3f27ec39c9b871ea0332e472a439ada2620d71') -url="https://www.cons.org/cmucl/" -arch=('i686' 'x86_64') - -prepare() { - cd "${srcdir}" - - if [[ $CARCH == "i686" ]]; then - sed -i 's|i386\*|i686\*|' bin/build-all.sh - fi -} - -build() { - cd "${srcdir}" - export CMUCLLIB="${srcdir}"/lib/cmucl/lib - # Build using binary-dist lisp - ./bin/build-all.sh -o "${srcdir}"/bin/lisp -} - -package() { - cd "${srcdir}" - # install distribution - ./bin/make-dist.sh -I "${pkgdir}"/usr -M share/man/man1 linux-4 - # move docs - mv "${pkgdir}"/usr/doc "${pkgdir}"/usr/share/ - # backwards compatibility - ln -sf lisp "${pkgdir}"/usr/bin/cmucl - # license - install -D -m644 "${srcdir}"/src/general-info/COPYRIGHTS \ - "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} - Copied: cmucl/repos/extra-i686/PKGBUILD (from rev 280861, cmucl/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2016-11-15 20:21:14 UTC (rev 280862) @@ -0,0 +1,54 @@ +# Contributor: John Proctor <jproc...@prium.net> +# Contributor: Alain Kalker <a.c.kal...@gmail.com> +# Maintainer: Juergen Hoetzel <juer...@archlinux.org> + +pkgname=cmucl +pkgver=21b +pkgrel=1 +pkgdesc="CMU Common Lisp" +depends_i686=('glibc' 'lesstif') +depends_x86_64=('lib32-glibc' 'lesstif') +provides=('common-lisp') +makedepends=('sed' 'bc') +license=('custom') +#license PublicDomain +source=("https://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-src-${pkgver}.tar.bz2" + "https://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-src-${pkgver}.tar.bz2.asc" + "https://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-${pkgver}-x86-linux.tar.bz2" + "https://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-${pkgver}-x86-linux.tar.bz2.asc") +sha256sums=('6f9ea5920d38d6881cee85d976565b3a6070bf6473dd64254e0e9f2f23625875' + 'SKIP' + 'eaccb1d676dbf40c5327ae5c61a7a638e4c12525b1e4118535582ffb7c59638e' + 'SKIP') +validpgpkeys=('0EF50ED55514BFF6B72B9DAC06CE3819086C750B') # "Raymond Toy <toy.raym...@gmail.com> +url="https://www.cons.org/cmucl/" +arch=('i686') + +prepare() { + cd "${srcdir}" + + if [[ $CARCH == "i686" ]]; then + sed -i 's|i386\*|i686\*|' bin/build-all.sh + fi +} + +build() { + cd "${srcdir}" + export CMUCLLIB="${srcdir}"/lib/cmucl/lib + # Build using binary-dist lisp + ./bin/build-all.sh -o "${srcdir}"/bin/lisp +} + +package() { + cd "${srcdir}" + # install distribution + ./bin/make-dist.sh -I "${pkgdir}"/usr -M share/man/man1 linux-4 + # move docs + mv "${pkgdir}"/usr/doc "${pkgdir}"/usr/share/ + # backwards compatibility + ln -sf lisp "${pkgdir}"/usr/bin/cmucl + # license + install -D -m644 "${srcdir}"/src/general-info/COPYRIGHTS \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + Deleted: workaround-for-gcc-4.6-overoptimization =================================================================== --- workaround-for-gcc-4.6-overoptimization 2016-11-15 20:21:04 UTC (rev 280861) +++ workaround-for-gcc-4.6-overoptimization 2016-11-15 20:21:14 UTC (rev 280862) @@ -1,19 +0,0 @@ -Description: GCC 4.6 optimizes away the direction of stack testing, so do it by hand -Author: Peter Van Eynde <pvane...@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; - } - - Copied: cmucl/repos/extra-i686/workaround-for-gcc-4.6-overoptimization (from rev 280861, cmucl/trunk/workaround-for-gcc-4.6-overoptimization) =================================================================== --- workaround-for-gcc-4.6-overoptimization (rev 0) +++ workaround-for-gcc-4.6-overoptimization 2016-11-15 20:21:14 UTC (rev 280862) @@ -0,0 +1,19 @@ +Description: GCC 4.6 optimizes away the direction of stack testing, so do it by hand +Author: Peter Van Eynde <pvane...@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; + } + +