summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarn W. Burton2021-11-19 19:07:08 -0500
committerTarn W. Burton2021-11-19 19:07:08 -0500
commitf95b9a196128dbbeaac7d16f08ef6cb8f74ecda4 (patch)
tree3819d859f8028bf655e6e8ab12b0c3ae68776d6c
parent2e6c7afe4c416454cd4a172b59e638fee5988f8c (diff)
downloadaur-f95b9a196128dbbeaac7d16f08ef6cb8f74ecda4.tar.gz
Update for LLVM13 stock
-rw-r--r--.SRCINFO7
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD9
-rw-r--r--wscript.config10
4 files changed, 16 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fa2e75a0ea5f..2a5fc60f5498 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = clasp-cl-git
pkgdesc = Bringing Common Lisp and C++ Together
- pkgver = 0.4.2.r4453.gee36ba131
+ pkgver = 0.4.2.r4924.gfb017d54b
pkgrel = 1
url = https://github.com/clasp-developers/clasp
arch = x86_64
@@ -13,9 +13,10 @@ pkgbase = clasp-cl-git
depends = gmp
depends = libbsd
depends = libedit
+ depends = clang
depends = libelf
depends = libffi
- depends = llvm13
+ depends = llvm
depends = netcdf
depends = ncurses
depends = zlib
@@ -34,7 +35,7 @@ pkgbase = clasp-cl-git
sha512sums = SKIP
sha512sums = SKIP
sha512sums = 8efec9d46f0008c9f2fab387837f5a02d60ebb9f4a83106142ae954bc322b99bd48f9e91e2107dda188d679e27ddb5f48e444adfa98e6c15cf454923dfccadd5
- sha512sums = 1924197ff79d93f4683f3a818f1b5f7f9f26c107dbe6b6ea74a810608e38570bba50852fc0636753bedfee1e0dff2abbfe2394c721014de7d66350ca14aacdec
+ sha512sums = 1f991c23462def8d502c10e2a2b42cee531f0c43c57c6929c00b78bde947c1f8612a4ffd989fce1e394331dac71626326d90acae0d9019a2a86f16a592ca0e51
sha512sums = 1624ca5ba9502afbcfe8c603590c884c3081162a94f86eded74ec8f1e2a1a2ca03694e2bef4190473b6c34230a478b2e95a87b5c458ff60028ca9b740cc173cd
pkgname = clasp-cl-git
diff --git a/.gitignore b/.gitignore
index cf1b01442a6d..759a6310fdb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ pkg
*.tar.gz
*.zst
clasp
+cando
+seqan-clasp
diff --git a/PKGBUILD b/PKGBUILD
index b9d938aefca7..69b585fc6e65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@ _srcname=clasp
_qlver=2021-02-13
pkgname=clasp-cl
pkgname=clasp-cl-git
-pkgver=0.4.2.r4453.gee36ba131
+pkgver=0.4.2.r4924.gfb017d54b
pkgrel=1
pkgdesc="Bringing Common Lisp and C++ Together"
arch=('x86_64')
url="https://github.com/clasp-developers/clasp"
license=('LGPL')
options+=(!strip)
-depends=('boost' 'expat' 'gmp' 'libbsd' 'libedit'
- 'libelf' 'libffi' 'llvm13' 'netcdf' 'ncurses' 'zlib')
+depends=('boost' 'expat' 'gmp' 'libbsd' 'libedit' 'clang'
+ 'libelf' 'libffi' 'llvm' 'netcdf' 'ncurses' 'zlib')
makedepends=('git' 'python' 'sbcl')
provides=('cclasp-boehm' 'common-lisp' 'clasp-cl' 'cando')
source=('git://github.com/clasp-developers/clasp.git'
@@ -24,7 +24,7 @@ sha512sums=('SKIP'
'SKIP'
'SKIP'
'8efec9d46f0008c9f2fab387837f5a02d60ebb9f4a83106142ae954bc322b99bd48f9e91e2107dda188d679e27ddb5f48e444adfa98e6c15cf454923dfccadd5'
- '1924197ff79d93f4683f3a818f1b5f7f9f26c107dbe6b6ea74a810608e38570bba50852fc0636753bedfee1e0dff2abbfe2394c721014de7d66350ca14aacdec'
+ '1f991c23462def8d502c10e2a2b42cee531f0c43c57c6929c00b78bde947c1f8612a4ffd989fce1e394331dac71626326d90acae0d9019a2a86f16a592ca0e51'
'1624ca5ba9502afbcfe8c603590c884c3081162a94f86eded74ec8f1e2a1a2ca03694e2bef4190473b6c34230a478b2e95a87b5c458ff60028ca9b740cc173cd')
pkgver() {
@@ -42,6 +42,7 @@ build() {
cd "$_srcname/"
cp ../wscript.config .
sed -i s/\"--link-static\",//g wscript
+ sed -i "s/# CLANG_LIBRARIES = \[ 'clang-cpp' \]/CLANG_LIBRARIES = \[ 'clang-cpp' \]/g" wscript
sed -i s/stlib/lib/g extensions/cando/wscript
sed -i s/STLIB/LIB/g extensions/cando/wscript
./waf configure --enable-jupyter
diff --git a/wscript.config b/wscript.config
index bc0c882bc4ae..49aa4570442c 100644
--- a/wscript.config
+++ b/wscript.config
@@ -1,8 +1,8 @@
USE_PARALLEL_BUILD = True
USE_LLD = True
PREFIX = '/usr'
-LLVM_CONFIG_BINARY = '/opt/llvm13/bin/llvm-config'
-DEBUG_OPTIONS = ["DEBUG_RELEASE",
- "DEBUG_BCLASP_LISP",
- "DEBUG_CCLASP_LISP"]
-
+LLVM_CONFIG_BINARY = '/usr/bin/llvm-config'
+DEBUG_OPTIONS = ["DEBUG_CCLASP_LISP",
+ "DEBUG_VERIFY_MODULES",
+ "DEBUG_ASSERT_TYPE_CAST",
+ "DEBUG_JIT_LOG_SYMBOLS"]