summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrent Carmer2018-05-23 13:11:41 -0700
committerBrent Carmer2018-05-23 13:11:41 -0700
commit890f942dfd068b1b26e107773a60e61ea1ea3189 (patch)
treed86109e6f75bcadfb4194a8cd1fb3b8458288234
parent72308a37c5fa9359cab856a21db3a61b4ee067f0 (diff)
downloadaur-890f942dfd068b1b26e107773a60e61ea1ea3189.tar.gz
update build
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD11
2 files changed, 7 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 79563519e028..20abfa9a1a1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,14 @@
# Generated by mksrcinfo v8
-# Tue Nov 7 19:32:31 UTC 2017
+# Wed May 23 20:11:37 UTC 2018
pkgbase = saw-script-git
pkgdesc = The SAW scripting language.
- pkgver = 6e417757
+ pkgver = 0dbc21f1
pkgrel = 1
url = http://saw.galois.com/
arch = x86_64
license = noncommercial
makedepends = cabal-install
- depends = cvc4
- depends = java-environment
depends = ncurses
- depends = cryptol
depends = z3
provides = saw-script
conflicts = saw-script
diff --git a/PKGBUILD b/PKGBUILD
index e5379f2f8082..3cc98f3c3fb0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=saw-script-git
_pkgname=saw-script
-pkgver=6e417757
+pkgver=0dbc21f1
pkgver() {
cd "$_pkgname"
git describe --long --tags --always | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
@@ -13,7 +13,7 @@ pkgdesc="The SAW scripting language."
url="http://saw.galois.com/"
arch=('x86_64')
license=('noncommercial')
-depends=('cvc4' 'java-environment' 'ncurses' 'cryptol' 'z3')
+depends=('ncurses' 'z3')
makedepends=('cabal-install')
optdepends=()
conflicts=()
@@ -28,9 +28,8 @@ source=('git://github.com/GaloisInc/saw-script.git')
build() {
cd $srcdir/${_pkgname}
cabal update
- hash stack || cabal install stack
- ln -fs stack.ghc-8.0-unix.yaml stack.yaml
- ./build.sh
+ git submodule update --init
+ cabal new-build
}
package() {
@@ -38,5 +37,5 @@ package() {
mkdir -p $pkgdir/usr/bin
cd $srcdir/$_pkgname
cp LICENSE $pkgdir/usr/share/licenses/$_pkgname
- cp $(stack path --local-install-root)/bin/saw $pkgdir/usr/bin
+ cp $(find dist-newstyle -name "saw" -type f) $pkgdir/usr/bin
}