Click here to go back to the commit logs for clasp-cl-git.

Commit:

---

Hash: 97056e776a1c51bfae3d0183c1d0bdd615b9c9fa

Message: Remove cando

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index e9d95f5..e7a747e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = clasp-cl-git
 	pkgdesc = Bringing Common Lisp and C++ Together
-	pkgver = 0.4.2.r4441.g3e83f0ba9
+	pkgver = 0.4.2.r4458.g8dfdf6839
 	pkgrel = 1
 	url = https://github.com/clasp-developers/clasp
 	arch = x86_64
@@ -41,19 +41,12 @@ pkgbase = clasp-cl-git
 	provides = cclasp-boehm
 	provides = common-lisp
 	provides = clasp-cl
-	provides = cando
 	options = !strip
 	source = git://github.com/clasp-developers/clasp.git
-	source = git://github.com/clasp-developers/seqan-clasp.git
-	source = git://github.com/cando-developers/cando.git
 	source = https://github.com/quicklisp/quicklisp-client/archive/refs/tags/version-2021-02-13.tar.gz
 	source = wscript.config
-	source = clasp.sh
-	sha512sums = SKIP
-	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = 8efec9d46f0008c9f2fab387837f5a02d60ebb9f4a83106142ae954bc322b99bd48f9e91e2107dda188d679e27ddb5f48e444adfa98e6c15cf454923dfccadd5
 	sha512sums = ddd11af3442c04a20a2f084e99144019a833bd26e2a29471fba64781b53534a9ef3663a5c6e6e2a8782f378f578abaf1d14c68b9223a6f1be82ed5fbe33a50a2
-	sha512sums = 1624ca5ba9502afbcfe8c603590c884c3081162a94f86eded74ec8f1e2a1a2ca03694e2bef4190473b6c34230a478b2e95a87b5c458ff60028ca9b740cc173cd
 
 pkgname = clasp-cl-git
diff --git a/PKGBUILD b/PKGBUILD
index b0e4bf9..2e93d0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: Tarn W. Burton <twburton@gmail.com>
 _qlver=2021-02-13
 _srcname=clasp
-pkgname=clasp-cl
 pkgname=clasp-cl-git
-pkgver=0.4.2.r4441.g3e83f0ba9
+pkgver=0.4.2.r4458.g8dfdf6839
 pkgrel=1
 pkgdesc="Bringing Common Lisp and C++ Together"
 arch=('x86_64')
@@ -16,37 +15,22 @@ depends=('libexpat1-dev' 'libgmp-dev' 'libbsd-dev' 'libedit-dev' 'libgmp-dev'
 makedepends=('git' 'python3' 'python-is-python3' 'sbcl' 'libexpat1-dev' 'libgmp-dev' 'libbsd-dev' 'libedit-dev' 'libgmp-dev'
          'libelf-dev' 'libffi-dev' 'llvm13' 'libnetcdf-dev' 'libncurses-dev' 'zlib1g-dev' 'libgc-dev'
          'libunwind-dev' 'libczmq-dev' 'libboost-graph-dev')
-provides=('cclasp-boehm' 'common-lisp' 'clasp-cl' 'cando')
+provides=('cclasp-boehm' 'common-lisp' 'clasp-cl')
 source=('git://github.com/clasp-developers/clasp.git'
-        'git://github.com/clasp-developers/seqan-clasp.git'
-        'git://github.com/cando-developers/cando.git'
         "https://github.com/quicklisp/quicklisp-client/archive/refs/tags/version-$_qlver.tar.gz"
-        'wscript.config'
-        'clasp.sh')
+        'wscript.config')
 sha512sums=('SKIP'
-            'SKIP'
-            'SKIP'
             '8efec9d46f0008c9f2fab387837f5a02d60ebb9f4a83106142ae954bc322b99bd48f9e91e2107dda188d679e27ddb5f48e444adfa98e6c15cf454923dfccadd5'
-            'ddd11af3442c04a20a2f084e99144019a833bd26e2a29471fba64781b53534a9ef3663a5c6e6e2a8782f378f578abaf1d14c68b9223a6f1be82ed5fbe33a50a2'
-            '1624ca5ba9502afbcfe8c603590c884c3081162a94f86eded74ec8f1e2a1a2ca03694e2bef4190473b6c34230a478b2e95a87b5c458ff60028ca9b740cc173cd')
+            'ddd11af3442c04a20a2f084e99144019a833bd26e2a29471fba64781b53534a9ef3663a5c6e6e2a8782f378f578abaf1d14c68b9223a6f1be82ed5fbe33a50a2')
 
 pkgver() {
   cd "$_srcname"
   git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-  cd "$_srcname"
-  git submodule add -f $srcdir/seqan-clasp extensions/seqan-clasp
-  git submodule add -f $srcdir/cando extensions/cando
-}
-
 build() {
   cd "$_srcname/"
   cp ../wscript.config .
-  # sed -i s/\"--link-static\",//g wscript
-  # sed -i s/stlib/lib/g extensions/cando/wscript
-  # sed -i s/STLIB/LIB/g extensions/cando/wscript
   sed -i 's/SBCL_VERSION = (2, 1)/SBCL_VERSION = (2, 0)/g' wscript
   sed -i 's/SBCL_VERSION_STRING = "2.1"/SBCL_VERSION_STRING = "2.0"/g' wscript
   ./waf configure --enable-jupyter
@@ -56,10 +40,7 @@ build() {
 package() {
   cd "$_srcname/"
   ./waf install_dboehmprecise --destdir "$pkgdir"
-  install -o root -m 755 ../clasp.sh "$pkgdir/usr/bin/clasp"
   CLASP_QUICKLISP_DIRECTORY=$srcdir/quicklisp-client-version-$_qlver CLASP_FEATURES=ignore-extensions ./build/boehmprecise/iclasp-boehmprecise -N -l 'quicklisp:setup.lisp' -e '(ql:quickload :common-lisp-jupyter)' -e "(clj:install :use-implementation t :system t :bin-path \"/usr/bin/clasp\" :prefix \"$pkgdir\")"
-  CLASP_QUICKLISP_DIRECTORY=$srcdir/quicklisp-client-version-$_qlver ./build/boehmprecise/icando-boehmprecise -N -e '(ql:quickload :cando-jupyter)' -e "(cando-jupyter:install :system t :bin-path \"/usr/bin/icando\" :prefix \"$pkgdir\")" \
-    -e "(cando-jupyter:install :system t :image t :bin-path \"/usr/bin/cando\" :prefix \"$pkgdir\")"
   sed -i '/"\/usr\/bin\/clasp",.*/a     "--load", "quicklisp:setup.lisp",' $pkgdir/usr/share/jupyter/kernels/common-lisp_clasp/kernel.json
   mkdir -p "$pkgdir/usr/lib/clasp/src/lisp/modules/quicklisp"
   cp -ra $srcdir/quicklisp-client-version-$_qlver/* "$pkgdir/usr/lib/clasp/src/lisp/modules/quicklisp/"
diff --git a/clasp.sh b/clasp.sh
deleted file mode 100644
index 87cce52..0000000
--- a/clasp.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-CLASP_FEATURES=ignore-extensions exec /usr/bin/iclasp-boehmprecise "$@"