Fix build

2 files changed, 33 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 828e007fe12f..b19565639ed5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,26 @@
 pkgbase = souffle
 	pkgdesc = Soufflé is a translator of declarative Datalog programs into the C++ language
 	pkgver = 2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/souffle-lang/souffle
 	arch = any
 	license = UPL
-	makedepends = autoconf
-	makedepends = automake
-	makedepends = bison
-	makedepends = doxygen
+	makedepends = git
+	makedepends = cmake>=3.15
+	makedepends = bison>=3.0.4
 	makedepends = flex
-	makedepends = sqlite
-	makedepends = libtool
-	makedepends = jdk8-openjdk
-	makedepends = pkg-config
-	makedepends = python
+	makedepends = libffi
+	makedepends = ncurses
 	makedepends = zlib
-	depends = sqlite
-	depends = python
-	depends = zlib
+	makedepends = lsb-release
 	depends = mcpp
+	depends = gcc>=7
+	depends = openmp
+	depends = sqlite
+	optdepends = bash-completion
 	provides = souffle
 	conflicts = souffle-git
-	source = https://github.com/souffle-lang/souffle/archive/2.1.zip
-	md5sums = e5ac5a043ce1b1982f9e75a88b2cb697
+	source = souffle-2.1.tar.gz::https://github.com/souffle-lang/souffle/archive/2.1.tar.gz
+	md5sums = SKIP
 
 pkgname = souffle
-
diff --git a/PKGBUILD b/PKGBUILD
index 000136b4269c..11e9b4a599b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,35 @@
-# Maintainer: Eric Schulte <eschulte@grammatech.com>
-#
-# Based off of the souffle-git pkgfile by
-# Sam Linnfer <littlelightlittlefire@gmail.com>
+# Maintainers: 
+# Eric Schulte <eschulte@grammatech.com>
+# Xiaowen Hu <xihu5895@uni.sydney.edu.au>
+
 pkgname=souffle
 pkgver=2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Soufflé is a translator of declarative Datalog programs into the C++ language"
 arch=('any')
 url="https://github.com/souffle-lang/souffle"
 license=('UPL')
 groups=()
-depends=('sqlite' 'python' 'zlib' 'mcpp')
-makedepends=('autoconf' 'automake' 'bison' 'doxygen' 'flex' 'sqlite' 'libtool' 'jdk8-openjdk' 'pkg-config' 'python' 'zlib')
+depends=('mcpp' 'gcc>=7' 'openmp' 'sqlite')
+makedepends=('git' 'cmake>=3.15' 'bison>=3.0.4' 'flex' 'libffi' 'ncurses' 'zlib' 'lsb-release')
+optdepends=('bash-completion')
 provides=('souffle')
 conflicts=('souffle-git')
-backup=()
-options=()
-install=
-noextract=()
-source=("https://github.com/souffle-lang/souffle/archive/${pkgver}.zip")
-md5sums=('e5ac5a043ce1b1982f9e75a88b2cb697')
+source=(souffle-2.1.tar.gz::https://github.com/souffle-lang/souffle/archive/2.1.tar.gz)
+md5sums=('SKIP')
 
 build() {
-    cd "$srcdir/${pkgname}-${pkgver}"
-    sed -i "s/git describe --tags --always/echo ${pkgver}/" configure.ac
-    sed -i '/AC_CONFIG_MACRO_DIR(/d' configure.ac
-    sh ./bootstrap
-    ./configure --prefix=/usr
-    # When necessary, fixup deprecated form in src/parser.yy and rebuild.
-    make -j $(nproc) || (bison --update src/parser.yy && make)
+	cd souffle-${pkgver}
+	cmake -S . -B ./build \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DSOUFFLE_GIT=OFF \
+        -DSOUFFLE_VERSION=${pkgver} \
+        -DPACKAGE_VERSION=${pkgver} \
+
+    cmake --build ./build --parallel "$(nproc)"
 }
 
 package() {
-    cd "$srcdir/${pkgname}-${pkgver}"
-    make DESTDIR="$pkgdir/" install
+	cd souffle-${pkgver}/build
+	make DESTDIR="$pkgdir/" install
 }