Enable CLN and make library thread-safe.

2 files changed, 13 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2dc7a5dcb871..5b42897753f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,11 +6,12 @@ pkgbase = carl
 	arch = i686
 	arch = x86_64
 	license = MIT
-	makedepends = make
 	makedepends = cmake>=3.0
-	depends = gmp>=5.1
-	depends = eigen>=3.2
+	makedepends = make>=4.2
 	depends = boost>=1.55
+	depends = cln>=1.3
+	depends = eigen>=3.2
+	depends = gmp>=5.1
 	source = https://github.com/smtrat/carl/archive/17.08.zip
 	md5sums = 3fc7b590b386051bad44ead47a5bd00c
 
diff --git a/PKGBUILD b/PKGBUILD
index 487bce1df6d8..03a2cce8504f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,21 +7,22 @@ pkgdesc="An Open Source C++ Library for Computer Arithmetic and Logic"
 arch=("i686" "x86_64")
 url="https://github.com/smtrat/carl"
 license=('MIT')
-depends=("gmp>=5.1" "eigen>=3.2" "boost>=1.55")
-makedepends=("make" "cmake>=3.0")
+depends=("boost>=1.55" "cln>=1.3" "eigen>=3.2" "gmp>=5.1")
+makedepends=("cmake>=3.0" "make>=4.2")
 conflicts=()
 replaces=()
 backup=()
 source=("https://github.com/smtrat/carl/archive/$pkgver.zip")
 md5sums=('3fc7b590b386051bad44ead47a5bd00c')
 
-prepare() {
-  cd "$pkgname-$pkgver"
-}
 build() {
-  cd "$pkgname-$pkgver"
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DEXPORT_TO_CMAKE=OFF .
-  make resources
+  mkdir -p "$pkgname-$pkgver/build"
+  cd "$pkgname-$pkgver/build"
+  cmake \
+    -DCMAKE_BUILD_TYPE=Release -DEXPORT_TO_CMAKE=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib \
+    -DTHREAD_SAFE=ON -DUSE_CLN_NUMBERS=ON \
+    ../
   make lib_carl
 }
 check() {