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

Commit:

---

Hash: c5ddd9e9d3722293f25e3e77f5a24c8b27bc676b

Message: update

Diff

---

diff --git a/PKGBUILD b/PKGBUILD
index 5bffa59..51cc4fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Tarn W. Burton <twburton@gmail.com>
+_qlver=2021-02-13
 _srcname=clasp
 pkgname=clasp-cl
 pkgname=clasp-cl-git
@@ -18,7 +19,7 @@ provides=('cclasp-boehm' 'common-lisp' 'clasp-cl' 'cando')
 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-2021-02-13.tar.gz'
+        "https://github.com/quicklisp/quicklisp-client/archive/refs/tags/version-$_qlver.tar.gz"
         'wscript.config'
         'clasp.sh')
 sha512sums=('SKIP'
@@ -47,21 +48,20 @@ build() {
   # 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
-  #sed -i 's/BOOST_LIBRARIES = \[\]/BOOST_LIBRARIES = \["boost_date_time"\]/g' wscript
   ./waf configure --enable-jupyter
-  CLASP_QUICKLISP_DIRECTORY=$srcdir/quicklisp-client-version-2021-02-13 ./waf build_dboehmprecise
+  CLASP_QUICKLISP_DIRECTORY=$srcdir/quicklisp-client-version-$_qlver ./waf build_dboehmprecise
 }
 
 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-2021-02-13 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-2021-02-13 ./build/boehmprecise/icando-boehmprecise -N -e '(ql:quickload :cando-jupyter)' -e "(cando-jupyter:install :system t :bin-path \"/usr/bin/icando\" :prefix \"$pkgdir\")" \
+  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
+  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-2021-02-13/* "$pkgdir/usr/lib/clasp/src/lisp/modules/quicklisp/"
+  cp -ra $srcdir/quicklisp-client-version-$_qlver/* "$pkgdir/usr/lib/clasp/src/lisp/modules/quicklisp/"
   chmod a+w "$pkgdir/usr/lib/clasp/src/lisp/modules/quicklisp/local-projects/system-index.txt"
 }
 
diff --git a/wscript.config b/wscript.config
index 175764c..3242e8a 100644
--- a/wscript.config
+++ b/wscript.config
@@ -1,6 +1,6 @@
 USE_PARALLEL_BUILD = True
 USE_LLD = True
-PREFIX = '/usr'
+PREFIX = '/usr/'
 LLVM_CONFIG_BINARY = '/opt/llvm13/bin/llvm-config'
 DEBUG_OPTIONS = ["DEBUG_RELEASE",
                  "DEBUG_BCLASP_LISP",