[arch-commits] Commit in cvc4/trunk (3 files)

[Antonio Rojas]

    Date: Friday, December 1, 2017 @ 20:49:20
  Author: arojas
Revision: 271229

Update to 1.5

Added:
  cvc4/trunk/cvc4-gcc7.patch
Modified:
  cvc4/trunk/PKGBUILD
Deleted:
  cvc4/trunk/configure-boost-version.patch

-------------------------------+
 PKGBUILD                      |   28 +++++++++++-----------------
 configure-boost-version.patch |   27 ---------------------------
 cvc4-gcc7.patch               |   10 ++++++++++
 3 files changed, 21 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-01 20:11:44 UTC (rev 271228)
+++ PKGBUILD	2017-12-01 20:49:20 UTC (rev 271229)
@@ -3,8 +3,8 @@
 # Contributor: Philipp Sieweck
 
 pkgname=cvc4
-pkgver=1.4
-pkgrel=5
+pkgver=1.5
+pkgrel=1
 pkgdesc="An automatic theorem prover"
 arch=('x86_64')
 url="http://cvc4.cs.nyu.edu/web/"
@@ -11,30 +11,24 @@
 depends=('boost' 'libantlr3c' 'cln')
 optdepends=('readline: for an improved interaction support')
 license=('GPL' 'BSD' 'MIT' 'custom:HPND')
-source=("http://cvc4.cs.nyu.edu/builds/src/cvc4-$pkgver.tar.gz"
-        configure-boost-version.patch)
-md5sums=('581c559c02b94fcb18b2e5b11432e009'
-         'd9cbfad2415d4a675ebabf3f7c5cdd5d')
+source=("http://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-$pkgver.tar.gz" cvc4-gcc7.patch)
+sha256sums=('11ee2c3c182556a5ef750da9631191b3ad6c4ea592eb81d067a2edc41e57bd7b'
+            'be2a4a9c843da030b12215bebbd159f2b5acaa1465eb9d1aab2f10c350f4defa')
 
 prepare() {
-  patch "$srcdir"/cvc4-$pkgver/configure configure-boost-version.patch
+  cd $pkgname-$pkgver
+  patch -p1 -i ../cvc4-gcc7.patch # Fix build with GCC 7
 }
 
 build() {
-  cd "$srcdir"/cvc4-$pkgver
-  export CXXFLAGS+=" -std=gnu++98"
+  cd $pkgname-$pkgver
+#  export CXXFLAGS+=" -std=gnu++98"
   ./configure --prefix=/usr --enable-optimization --disable-doxygen-doc --with-cln --enable-gpl
   make
 }
 
 package() {
-  cd "$srcdir"/cvc4-$pkgver
+  cd $pkgname-$pkgver
   make prefix="$pkgdir"/usr install
-  install -D COPYING "$pkgdir"/usr/share/licenses/cvc4/LICENCE
-
-  cd "$pkgdir"
-  rmdir "usr/share/perl5" "usr/lib/pyshared" "usr/lib/php" "usr/lib/jni" \
-        "usr/lib/csharp" "usr/share/java" "usr/share/php" "usr/share/csharp" \
-        "usr/lib/ruby" "usr/lib/tcltk" "usr/lib/perl5" "usr/share/pyshared" \
-        "usr/lib/ocaml/cvc4" "usr/lib/ocaml"
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/cvc4/LICENSE
 }

Deleted: configure-boost-version.patch
===================================================================
--- configure-boost-version.patch	2017-12-01 20:11:44 UTC (rev 271228)
+++ configure-boost-version.patch	2017-12-01 20:49:20 UTC (rev 271229)
@@ -1,27 +0,0 @@
---- configure~	2014-07-13 19:47:37.469270988 +0200
-+++ configure	2015-06-09 13:46:07.731066225 +0200
-@@ -24795,17 +24795,15 @@
- if ${boost_cv_lib_version+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+  cat confdefs.h - <<EOF >conftest.c
- /* end confdefs.h.  */
- #include <boost/version.hpp>
--boost-lib-version = BOOST_LIB_VERSION
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  tr -d '\r' |
--  $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then :
--  boost_cv_lib_version=`cat conftest.i`
--fi
--rm -rf conftest*
-+#include <stdio.h>
-+int main(int argc, char **argv) { printf("%s\n", BOOST_LIB_VERSION); return 0; }
-+EOF
-+  gcc conftest.c -o conftest
-+  boost_cv_lib_version=`./conftest`
-+  rm -f conftest conftest.c
- 
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_version" >&5

Added: cvc4-gcc7.patch
===================================================================
--- cvc4-gcc7.patch	                        (rev 0)
+++ cvc4-gcc7.patch	2017-12-01 20:49:20 UTC (rev 271229)
@@ -0,0 +1,10 @@
+--- cvc4-1.5/src/parser/memory_mapped_input_buffer.cpp.orig	2017-12-01 20:08:52.816279335 +0000
++++ cvc4-1.5/src/parser/memory_mapped_input_buffer.cpp	2017-12-01 20:09:02.786301783 +0000
+@@ -17,6 +17,7 @@
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdint.h>
++#include <unistd.h>
+ 
+ #include <antlr3input.h>
+