diff options
| -rw-r--r-- | .SRCINFO | 23 | ||||
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | PKGBUILD | 49 | ||||
| -rw-r--r-- | pkgver.lisp | 8 | ||||
| -rw-r--r-- | wscript.config | 7 |
5 files changed, 49 insertions, 43 deletions
@@ -1,33 +1,36 @@ pkgbase = clasp-cl-git pkgdesc = Bringing Common Lisp and C++ Together - pkgver = 0.4.2.r2955.gbdc09b2fe + pkgver = 2.5.0.r19.g74ab9a21e pkgrel = 1 url = https://github.com/clasp-developers/clasp arch = x86_64 license = LGPL makedepends = git - makedepends = python makedepends = sbcl + makedepends = ninja + makedepends = pkg-config depends = boost - depends = clang90 depends = expat + depends = fmt depends = gmp depends = libbsd depends = libedit + depends = clang depends = libelf depends = libffi - depends = llvm90 - depends = netcdf + depends = llvm depends = ncurses depends = zlib provides = cclasp-boehm provides = common-lisp provides = clasp-cl - provides = cando - source = git://github.com/clasp-developers/clasp.git - source = wscript.config + conflicts = cando + conflicts = cando-git + conflicts = clasp-cl + options = !strip + source = git+https://github.com/clasp-developers/clasp.git + source = pkgver.lisp sha512sums = SKIP - sha512sums = e3280bf14b0fc066c1bc95b9ea79244f487dbd3fb04e6f527fdf47da57edb6ab8a4b8cb633ab36b3d2a5f406192ad825e790a0fadf4a451a683d1d98d11f45dd + sha512sums = 731cad012e1a572128746ae9839dfe347e509cc2d4a5375a62ee92dbe88f1b601d032eafe82e6fc10d62932c95c72dbde63ecf43be7c5a979128a2e119b8fa32 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 @@ -1,43 +1,40 @@ # Maintainer: Tarn W. Burton <twburton@gmail.com> -_srcname=clasp -pkgname=clasp-cl pkgname=clasp-cl-git -pkgver=0.4.2.r2955.gbdc09b2fe +pkgver=2.5.0.r19.g74ab9a21e 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') -makedepends=('git' 'python' 'sbcl') -provides=('cclasp-boehm' 'common-lisp' 'clasp-cl' 'cando') -source=('git://github.com/clasp-developers/clasp.git' - 'wscript.config') +options+=(!strip) +depends=('boost' 'expat' 'fmt' 'gmp' 'libbsd' 'libedit' 'clang' + 'libelf' 'libffi' 'llvm' 'ncurses' 'zlib') +makedepends=('git' 'sbcl' 'ninja' 'pkg-config') +provides=('cclasp-boehm' 'common-lisp' 'clasp-cl') +conflicts=('cando' 'cando-git' 'clasp-cl') +source=('git+https://github.com/clasp-developers/clasp.git' + 'pkgver.lisp') sha512sums=('SKIP' - 'e3280bf14b0fc066c1bc95b9ea79244f487dbd3fb04e6f527fdf47da57edb6ab8a4b8cb633ab36b3d2a5f406192ad825e790a0fadf4a451a683d1d98d11f45dd') + '731cad012e1a572128746ae9839dfe347e509cc2d4a5375a62ee92dbe88f1b601d032eafe82e6fc10d62932c95c72dbde63ecf43be7c5a979128a2e119b8fa32') + +prepare() { + cd clasp + ./koga --build-mode=bytecode-faso --reproducible-build "--package-path=$pkgdir" -bin-path=/usr/bin/ --share-path=/usr/share/clasp/ --lib-path=/usr/lib/clasp/ --skip-sync=ansi-test,mps,cl-bench,cl-who + ./koga --skip-sync --update-version +} pkgver() { - cd "$_srcname" - git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' + cd clasp + sbcl --noinform --non-interactive --load ../pkgver.lisp } 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_cmps + cd clasp + ninja -C build } package() { - cd "$_srcname/" - ./waf install_cmps --destdir "$pkgdir" - ln -s /usr/bin/ccando-mps "$pkgdir/usr/bin/cando" - ln -s /usr/bin/cleap-mps "$pkgdir/usr/bin/cleap" + cd clasp + ninja -C build install } + diff --git a/pkgver.lisp b/pkgver.lisp new file mode 100644 index 000000000000..5ced318498d5 --- /dev/null +++ b/pkgver.lisp @@ -0,0 +1,8 @@ +(let* ((version (getf (with-open-file (s "version.sexp") (read s)) :version)) + (p1 (position #\- version)) + (p2 (position #\- version :from-end t))) + (write-string (subseq version 0 p1)) + (write-string ".r") + (write-string (subseq version (1+ p1) p2)) + (write-char #\.) + (write-string (subseq version (1+ p2)))) diff --git a/wscript.config b/wscript.config deleted file mode 100644 index f2d030aadbd4..000000000000 --- a/wscript.config +++ /dev/null @@ -1,7 +0,0 @@ -USE_PARALLEL_BUILD = True -USE_LLD = True -PREFIX = '/usr' -LLVM_CONFIG_BINARY = '/opt/llvm90/bin/llvm-config' -DEBUG_OPTIONS = ["DEBUG_RELEASE", - "DEBUG_BCLASP_LISP", - "DEBUG_CCLASP_LISP"] |