makedeb
makedeb
Bringing Common Lisp and C++ Together
Click here to go back to the commit logs for clasp-cl-git.
Hash: 77633ecedadb25936cfd0a53e73e2c209d0e8727
Message: Update quicklisp
diff --git a/.SRCINFO b/.SRCINFO
index 2946359..d869ef3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,29 @@
pkgbase = clasp-cl-git
pkgdesc = Bringing Common Lisp and C++ Together
- pkgver = 0.4.2.r4387.gcbf314109
+ pkgver = 0.4.2.r4441.g3e83f0ba9
pkgrel = 1
url = https://github.com/clasp-developers/clasp
arch = x86_64
license = LGPL
makedepends = git
makedepends = python3
+ makedepends = python-is-python3
makedepends = sbcl
- depends = libboost-all-dev
+ makedepends = libexpat1-dev
+ makedepends = libgmp-dev
+ makedepends = libbsd-dev
+ makedepends = libedit-dev
+ makedepends = libgmp-dev
+ makedepends = libelf-dev
+ makedepends = libffi-dev
+ makedepends = llvm13
+ makedepends = libnetcdf-dev
+ makedepends = libncurses-dev
+ makedepends = zlib1g-dev
+ makedepends = libgc-dev
+ makedepends = libunwind-dev
+ makedepends = libczmq-dev
+ makedepends = libboost-graph-dev
depends = libexpat1-dev
depends = libgmp-dev
depends = libbsd-dev
@@ -18,7 +33,7 @@ pkgbase = clasp-cl-git
depends = libffi-dev
depends = llvm13
depends = libnetcdf-dev
- depends = ncurses-dev
+ depends = libncurses-dev
depends = zlib1g-dev
depends = libgc-dev
depends = libunwind-dev
@@ -30,12 +45,14 @@ pkgbase = clasp-cl-git
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 = d58f230bdd46e814d807fccb8cfc84c742b77f08bad219159d2dc70a6b867d90ff0d33fcb9d4bfbbfed58a4aaef77d815e9274f12d55b1ff041910dc788b28a0
- sha512sums = 7f0ffe198a4005cd829d538119c30c74d47bced09d3df78d05604ea2eb2de7068682f4a785fe7472cedb0394ab607092f93f8a97c3d60939d9fc3eafc16ed481
+ sha512sums = 1624ca5ba9502afbcfe8c603590c884c3081162a94f86eded74ec8f1e2a1a2ca03694e2bef4190473b6c34230a478b2e95a87b5c458ff60028ca9b740cc173cd
pkgname = clasp-cl-git
diff --git a/PKGBUILD b/PKGBUILD
index d84ae4d..161366c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,33 @@
# Maintainer: Tarn W. Burton <twburton@gmail.com>
+_qlver=2021-02-13
_srcname=clasp
pkgname=clasp-cl
pkgname=clasp-cl-git
-pkgver=0.4.2.r4387.gcbf314109
+pkgver=0.4.2.r4441.g3e83f0ba9
pkgrel=1
pkgdesc="Bringing Common Lisp and C++ Together"
arch=('x86_64')
url="https://github.com/clasp-developers/clasp"
license=('LGPL')
-depends=('libboost-all-dev' 'libexpat1-dev' 'libgmp-dev' 'libbsd-dev' 'libedit-dev' 'libgmp-dev'
- 'libelf-dev' 'libffi-dev' 'llvm13' 'libnetcdf-dev' 'ncurses-dev' 'zlib1g-dev' 'libgc-dev'
+depends=('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')
-makedepends=('git' 'python3' 'sbcl')
+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')
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')
sha512sums=('SKIP'
'SKIP'
'SKIP'
+ '8efec9d46f0008c9f2fab387837f5a02d60ebb9f4a83106142ae954bc322b99bd48f9e91e2107dda188d679e27ddb5f48e444adfa98e6c15cf454923dfccadd5'
'd58f230bdd46e814d807fccb8cfc84c742b77f08bad219159d2dc70a6b867d90ff0d33fcb9d4bfbbfed58a4aaef77d815e9274f12d55b1ff041910dc788b28a0'
- '7f0ffe198a4005cd829d538119c30c74d47bced09d3df78d05604ea2eb2de7068682f4a785fe7472cedb0394ab607092f93f8a97c3d60939d9fc3eafc16ed481')
+ '1624ca5ba9502afbcfe8c603590c884c3081162a94f86eded74ec8f1e2a1a2ca03694e2bef4190473b6c34230a478b2e95a87b5c458ff60028ca9b740cc173cd')
pkgver() {
cd "$_srcname"
@@ -43,17 +48,19 @@ 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
- ./waf build_dboehmprecise
+ CLASP_QUICKLISP_DIRECTORY=$srcdir/quicklisp-client-version-$_qlver ./waf build_dboehmprecise
}
package() {
cd "$_srcname/"
./waf install_dboehmprecise --destdir "$pkgdir"
- install -m 755 -o root ../clasp.sh "$pkgdir/usr/bin/clasp"
- CLASP_FEATURES=ignore-extensions ./build/boehmprecise/iclasp-boehmprecise -N -e '(ql:quickload :common-lisp-jupyter)' -e "(clj:install :use-implementation t :system t :bin-path \"/usr/bin/clasp\" :prefix \"$pkgdir\")"
- ./build/boehmprecise/icando-boehmprecise -N -e '(ql:quickload :cando-jupyter)' -e "(cando-jupyter:install :system t :bin-path \"/usr/bin/icando\" :prefix \"$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
index 5eab89d..87cce52 100644
--- a/clasp.sh
+++ b/clasp.sh
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
-CLASP_FEATURES=ignore-extensions /usr/bin/iclasp-boehmprecise
+CLASP_FEATURES=ignore-extensions exec /usr/bin/iclasp-boehmprecise "$@"
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",