summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoritz Lipp2017-10-22 10:46:36 +0200
committerMoritz Lipp2017-10-22 10:46:36 +0200
commitc72b2ada2a6dbc8a21c37c84f37a082438a684b6 (patch)
treeac774b4a2e84b3deb5d8a8d67de6d7e9c1ad6b20
parentf67c357ac1df52e203ed8e7d64ecf2d9fce88b94 (diff)
downloadaur-c72b2ada2a6dbc8a21c37c84f37a082438a684b6.tar.gz
Update to 2.3.1-2
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD33
2 files changed, 27 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index adb66571ea7..439ca4ccb4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
# Generated by mksrcinfo v8
-# Mon Sep 25 12:19:10 UTC 2017
+# Sun Oct 22 08:46:25 UTC 2017
pkgbase = libsignal-protocol-c
pkgdesc = Signal Protocol C Library
pkgver = 2.3.1
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/WhisperSystems/libsignal-protocol-c
arch = i686
arch = x86_64
license = GPL3
+ checkdepends = check
+ checkdepends = openssl>=1.0
makedepends = cmake
source = https://github.com/WhisperSystems/libsignal-protocol-c/archive/v2.3.1.tar.gz
source = openssl1.1.patch
diff --git a/PKGBUILD b/PKGBUILD
index 331eac66e10..ba17a5bbf37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,47 +2,60 @@
pkgname=libsignal-protocol-c
pkgver=2.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="Signal Protocol C Library"
arch=('i686' 'x86_64')
url="https://github.com/WhisperSystems/libsignal-protocol-c"
license=('GPL3')
makedepends=('cmake')
-testdepends=('check', 'openssl>=1.0')
+checkdepends=('check' 'openssl>=1.0')
source=(https://github.com/WhisperSystems/$pkgname/archive/v$pkgver.tar.gz
'openssl1.1.patch')
md5sums=('8321edeba3e0642c4c98d5d2870db8cd'
'59f4b598a16fde94b3305377adbf7b83')
prepare() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-$pkgver"
patch -p1 < $srcdir/openssl1.1.patch
}
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-$pkgver"
mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=1 \
+ -DBUILD_TESTING=0 \
..
- make
+ make
}
check() {
- cd "$srcdir/$pkgname-$pkgver/build/tests"
+ cd "$srcdir/$pkgname-$pkgver"
+ mkdir -p build && cd build
+
+ # Build with tests
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=1 \
+ ..
+
+ make
+ # Build tests
+ cd tests
make
cd ..
- ctest
+ # Run tests
+ ctest
}
package() {
- cd "$srcdir/$pkgname-$pkgver/build"
- make DESTDIR="$pkgdir/" install
+ cd "$srcdir/$pkgname-$pkgver/build"
+ make DESTDIR="$pkgdir/" install
}