Switch to cmake and bump to ABC 0.21.0

1 files changed, 31 insertions, 36 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3be655fa1094..1d8b9c00a158 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,62 +1,57 @@
 # Maintainer: Josh Ellithorpe <quest@mac.com>
 
 pkgname=bitcoin-abc
-pkgver=0.20.12
-pkgrel=2
-pkgdesc="Bitcoin ABC  with bitcoind, bitcoin-tx, and bitcoin-cli"
+pkgver=0.21.0
+pkgrel=0
+pkgdesc="Bitcoin ABC  with bitcoind, bitcoin-tx, bitcoin-seeder and bitcoin-cli"
 arch=('i686' 'x86_64')
 url="https://bitcoinabc.org"
-depends=('boost-libs' 'libevent' 'openssl' 'zeromq')
-makedepends=('boost')
-optdepends=('miniupnpc: build with support for UPnP')
+depends=('boost-libs' 'libevent' 'openssl' 'zeromq' 'miniupnpc')
+makedepends=('cmake' 'ninja' 'boost')
 license=('MIT')
 source=(https://github.com/Bitcoin-ABC/bitcoin-abc/archive/v$pkgver.tar.gz
         bitcoin.conf
         bitcoin.logrotate
         bitcoin.service
         bitcoin-reindex.service
-        bitcoin.install
-        deque.patch)
-sha256sums=('f29be95fd199c28be196750dcbaf43a2f6a40dfe098838fa70b503b495a2588e'
+        bitcoin.install)
+sha256sums=('e9304832afbbf37e76aa3f90cabdf2fdc97093986412f28906a5595be55c3735'
             'b1908344281498d39bfa40c3b9725f9c95bf22602cd46e6120a1f17bad9dae35'
             '8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f'
             '9643eed2c20d78a9c7347df64099765773615f79d3b8a95693d871c933516880'
             '35ff9331d7df8b90adfc7d82752cca4f8b7ff23a29e5d10b07e4e3fc78050679'
-            'c8a667f7138a504f0a3018b48eb687814cfc741f4d38d8699b0b3b5234b25fea'
-            '8bb5f7be0b24f53084dbd51ca1a3cc3ff0fbb648b6ea7723c1ab6f7bcadb7673')
+            'c8a667f7138a504f0a3018b48eb687814cfc741f4d38d8699b0b3b5234b25fea')
 backup=('etc/bitcoin/bitcoin.conf'
         'etc/logrotate.d/bitcoin')
-provides=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx')
-conflicts=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx')
+provides=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx' 'bitcoin-seeder')
+conflicts=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx' 'bitcoin-seeder')
 install=bitcoin.install
 
 build() {
   cd "$srcdir/${pkgname}-$pkgver"
 
   msg2 'Building...'
-  patch -p1 < ../deque.patch
-  ./autogen.sh
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/bitcoin \
-    --sysconfdir=/etc \
-    --sharedstatedir=/usr/share/bitcoin \
-    --localstatedir=/var/lib/bitcoin \
-    --enable-hardening \
-    --with-gui=no \
-    --disable-wallet \
-    --with-gnu-ld \
-    --disable-maintainer-mode \
-    --enable-reduce-exports \
-    --disable-gui-tests
-  make
+  mkdir -p build
+  pushd build
+
+  cmake -GNinja .. \
+    -DENABLE_CLANG_TIDY=OFF \
+    -DCLIENT_VERSION_IS_RELEASE=ON \
+    -DENABLE_REDUCE_EXPORTS=ON \
+    -DENABLE_STATIC_LIBSTDCXX=ON \
+    -DBUILD_BITCOIN_WALLET=OFF \
+    -DBUILD_BITCOIN_QT=OFF \
+    -DCMAKE_INSTALL_PREFIX=$pkgdir/usr
+
+  ninja
+  popd
 }
 
 check() {
-  cd "$srcdir/${pkgname}-$pkgver"
+  cd "$srcdir/${pkgname}-$pkgver/build"
 
   msg2 'Testing...'
-  make check
+  ninja check
 }
 
 package() {
@@ -65,9 +60,6 @@ package() {
   msg2 'Installing license...'
   install -Dm 644 COPYING -t "$pkgdir/usr/share/licenses/${pkgname}"
 
-  msg2 'Installing man pages...'
-  install -Dm 644 doc/man/*.1 -t "$pkgdir/usr/share/man/man1"
-
   msg2 'Installing examples...'
   install -Dm644 "contrib/debian/examples/bitcoin.conf" \
     -t "$pkgdir/usr/share/doc/bitcoin/examples"
@@ -85,8 +77,11 @@ package() {
   install -dm 700 "$pkgdir/etc/bitcoin"
   install -dm 755 "$pkgdir/srv/bitcoin"
 
-  msg2 'Installing bitcoin...'
-  make DESTDIR="$pkgdir" install
+  pushd build
+  msg2 'Installing executables and man pages...'
+  cmake -DCOMPONENT=bitcoind -P cmake_install.cmake
+  cmake -DCOMPONENT=bitcoin-seeder -P cmake_install.cmake
+  popd
 
   msg2 'Installing bitcoin.conf...'
   install -Dm 600 "$srcdir/bitcoin.conf" -t "$pkgdir/etc/bitcoin"