Update for main

4 files changed, 31 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f90f3ccad14..5c48447c0338 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = clasp-cl-git
 	pkgdesc = Bringing Common Lisp and C++ Together
-	pkgver = 0.4.2.r2955.gbdc09b2fe
+	pkgver = 0.4.2.r4358.g19fef908c
 	pkgrel = 1
 	url = https://github.com/clasp-developers/clasp
 	arch = x86_64
@@ -9,14 +9,13 @@ pkgbase = clasp-cl-git
 	makedepends = python
 	makedepends = sbcl
 	depends = boost
-	depends = clang90
 	depends = expat
 	depends = gmp
 	depends = libbsd
 	depends = libedit
 	depends = libelf
 	depends = libffi
-	depends = llvm90
+	depends = llvm13
 	depends = netcdf
 	depends = ncurses
 	depends = zlib
@@ -27,7 +26,6 @@ pkgbase = clasp-cl-git
 	source = git://github.com/clasp-developers/clasp.git
 	source = wscript.config
 	sha512sums = SKIP
-	sha512sums = e3280bf14b0fc066c1bc95b9ea79244f487dbd3fb04e6f527fdf47da57edb6ab8a4b8cb633ab36b3d2a5f406192ad825e790a0fadf4a451a683d1d98d11f45dd
+	sha512sums = d58f230bdd46e814d807fccb8cfc84c742b77f08bad219159d2dc70a6b867d90ff0d33fcb9d4bfbbfed58a4aaef77d815e9274f12d55b1ff041910dc788b28a0
 
 pkgname = clasp-cl-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..cf1b01442a6d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+src
+pkg
+*.tar.gz
+*.zst
+clasp
diff --git a/PKGBUILD b/PKGBUILD
index b862e6c2c6f0..69ce0e111fda 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,20 @@
 _srcname=clasp
 pkgname=clasp-cl
 pkgname=clasp-cl-git
-pkgver=0.4.2.r2955.gbdc09b2fe
+pkgver=0.4.2.r4358.g19fef908c
 pkgrel=1
 pkgdesc="Bringing Common Lisp and C++ Together"
 arch=('x86_64')
 url="https://github.com/clasp-developers/clasp"
 license=('LGPL')
-depends=('boost' 'clang90' 'expat' 'gmp' 'libbsd' 'libedit'
-         'libelf' 'libffi' 'llvm90' 'netcdf' 'ncurses' 'zlib')
+depends=('boost' 'expat' 'gmp' 'libbsd' 'libedit'
+         'libelf' 'libffi' 'llvm13' 'netcdf' 'ncurses' 'zlib')
 makedepends=('git' 'python' 'sbcl')
 provides=('cclasp-boehm' 'common-lisp' 'clasp-cl' 'cando')
 source=('git://github.com/clasp-developers/clasp.git'
         'wscript.config')
 sha512sums=('SKIP'
-            'e3280bf14b0fc066c1bc95b9ea79244f487dbd3fb04e6f527fdf47da57edb6ab8a4b8cb633ab36b3d2a5f406192ad825e790a0fadf4a451a683d1d98d11f45dd')
+            'd58f230bdd46e814d807fccb8cfc84c742b77f08bad219159d2dc70a6b867d90ff0d33fcb9d4bfbbfed58a4aaef77d815e9274f12d55b1ff041910dc788b28a0')
 
 pkgver() {
   cd "$_srcname"
@@ -23,21 +23,26 @@ pkgver() {
 }
 
 build() {
-    cd "$_srcname/"
-    cp ../wscript.config .
-    sed -i s/\"--link-static\",//g wscript
-    git clone https://github.com/cando-developers/cando.git extensions/cando || (cd extensions/cando ; git reset --hard ; git pull)
-    sed -i s/stlib/lib/g extensions/cando/wscript
-    sed -i s/STLIB/LIB/g extensions/cando/wscript
-    sed -i s/subprocess.call/print/g extensions/cando/wscript
-    sed -i s/os.symlink/print/g extensions/cando/wscript
-    ./waf configure
-    ./waf build_cboehm
+  cd "$_srcname/"
+  cp ../wscript.config .
+  if [ ! -e "extensions/cando" ]; then
+    git clone https://github.com/cando-developers/cando extensions/cando
+  else
+    cd extensions/cando && git fetch && git pull && cd ../..
+  fi
+  if [ ! -e "extensions/seqan-clasp" ]; then
+    git clone https://github.com/clasp-developers/seqan-clasp.git extensions/seqan-clasp
+  else
+    cd extensions/seqan-clasp && git fetch && git pull && cd ../..
+  fi
+  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
+  ./waf configure --enable-jupyter
+  ./waf build_dboehmprecise
 }
 
 package() {
   cd "$_srcname/"
-  ./waf install_cboehm --destdir "$pkgdir"
-  ln -s /usr/bin/ccando-boehm "$pkgdir/usr/bin/cando"
-  ln -s /usr/bin/cleap-boehm "$pkgdir/usr/bin/cleap"
+  ./waf install_dboehmprecise --destdir "$pkgdir"
 }
diff --git a/wscript.config b/wscript.config
index f2d030aadbd4..175764cc556e 100644
--- a/wscript.config
+++ b/wscript.config
@@ -1,7 +1,7 @@
 USE_PARALLEL_BUILD = True
 USE_LLD = True
 PREFIX = '/usr'
-LLVM_CONFIG_BINARY = '/opt/llvm90/bin/llvm-config'
+LLVM_CONFIG_BINARY = '/opt/llvm13/bin/llvm-config'
 DEBUG_OPTIONS = ["DEBUG_RELEASE",
                  "DEBUG_BCLASP_LISP",
                  "DEBUG_CCLASP_LISP"]