[arch-commits] Commit in swi-prolog/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Saturday, February 9, 2019 @ 23:39:41
  Author: arodseth
Revision: 431041

upgpkg: swi-prolog 8.0.1-1

Modified:
  swi-prolog/trunk/PKGBUILD

----------+
 PKGBUILD |   44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-09 22:32:06 UTC (rev 431040)
+++ PKGBUILD	2019-02-09 23:39:41 UTC (rev 431041)
@@ -1,4 +1,4 @@
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
 # Contributor: Jachym Barvinek <jachymb at gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: John Proctor <jproctor at prium.net>
@@ -5,39 +5,45 @@
 # Contributor: Juergen Hoetzel <juergen at archlinux.org>
 
 pkgname=swi-prolog
-pkgver=7.6.4
-pkgrel=2
+pkgver=8.0.1
+pkgrel=1
 pkgdesc='Prolog environment'
 arch=('x86_64')
-url='http://www.swi-prolog.org/'
-license=('GPL' 'LGPL')
-depends=('gmp' 'libarchive' 'openssl' 'readline')
-makedepends=('libjpeg' 'libxft' 'libxinerama' 'libxpm' 'unixodbc')
+url='https://swi-prolog.org/'
+license=(GPL LGPL)
+depends=(gmp libarchive openssl readline)
+makedepends=(cmake libjpeg libxft libxinerama libxpm ninja unixodbc)
 optdepends=('unixodbc:    for using the odbc4pl library'
             'libjpeg:     for using the pl2xpce library'
             'libxpm:      for using the pl2xpce library'
             'libxinerama: for using the pl2xpce library'
             'libxft:      for using the pl2xpce library')
-source=("http://www.swi-prolog.org/download/stable/src/swipl-${pkgver/_/-}.tar.gz") # invalid HTTPS cert
-sha256sums=('2d3d7aabd6d99a02dcc2da5d7604e3500329e541c6f857edc5aa06a3b1267891')
+# invalid HTTPS cert
+source=("http://www.swi-prolog.org/download/stable/src/swipl-${pkgver/_/-}.tar.gz")
+sha256sums=('e42c703ce373f6435ab917989a7827a041d131cf79300311bb4c8ef188f1092f')
 
 build() {
-  cd "swipl-${pkgver/_/-}"
-
-  ./configure --with-world --prefix=/usr
-  (cd src; ./configure --enable-readline --prefix=/usr)
-  make
+  mkdir -p build
+  cd build
+  cmake ../swipl-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
+    -DVALA_CFLAGS="$CFLAGS -fPIC -w" \
+    -G Ninja
+  ../swipl-$pkgver/scripts/pgo-compile.sh
+  ninja
 }
 
 check() {
-  make -C "swipl-${pkgver/_/-}" check || true
+  cd build
+
+  # the zlib test fails
+  ctest -j 8 | true
 }
 
 package() {
-  make -C "swipl-${pkgver/_/-}" DESTDIR="$pkgdir" install
-
-  # Fix for FS#20873
-  chmod +x "$pkgdir/usr/lib/swipl-${pkgver/_/-}/library/dialect/sicstus/swipl-lfr.pl"
+  DESTDIR="$pkgdir" ninja -C build install
 }
 
 # getver: swi-prolog.org/download/stable