CVS commit: pkgsrc/math/z3

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Jul 16 04:02:13 UTC 2016

Modified Files:
        pkgsrc/math/z3: distinfo
Added Files:
        pkgsrc/math/z3/patches: patch-src_util_debug.cpp patch-src_util_mpz.cpp

Log Message:
gcc6 build fix


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/z3/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/math/z3/patches/patch-src_util_debug.cpp \
    pkgsrc/math/z3/patches/patch-src_util_mpz.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/z3/distinfo
diff -u pkgsrc/math/z3/distinfo:1.1 pkgsrc/math/z3/distinfo:1.2
--- pkgsrc/math/z3/distinfo:1.1 Tue Nov 24 05:45:58 2015
+++ pkgsrc/math/z3/distinfo     Sat Jul 16 04:02:13 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2015/11/24 05:45:58 dholland Exp $
+$NetBSD: distinfo,v 1.2 2016/07/16 04:02:13 markd Exp $
 
 SHA1 (z3-4.4.1.tar.gz) = 60094acaa53459ec694899aca9f17aa830875610
 RMD160 (z3-4.4.1.tar.gz) = 2c891e115a5d097dbbda53c1b322c65bc5b679f7
@@ -9,3 +9,5 @@ RMD160 (z3-jumbo-patch-20151123.gz) = eb
 SHA512 (z3-jumbo-patch-20151123.gz) = c23d363bf53b40c3ccbfc10d03ef3621d6abfa9cf86375e7e853e85a0971db70992173df04df1a895e16d4a9b533e955953455a7533889963d2920a4b48d0056
 Size (z3-jumbo-patch-20151123.gz) = 4395 bytes
 SHA1 (patch-scripts_mk__util.py) = 1ab32d86649c5b3e83e9b20632d21018a1e22617
+SHA1 (patch-src_util_debug.cpp) = 607ea4e078884920a3034cf00779dce25fc8e623
+SHA1 (patch-src_util_mpz.cpp) = 69988bec1472df14209ae0dbfdc8a94c9e71cc82

Added files:

Index: pkgsrc/math/z3/patches/patch-src_util_debug.cpp
diff -u /dev/null pkgsrc/math/z3/patches/patch-src_util_debug.cpp:1.1
--- /dev/null   Sat Jul 16 04:02:14 2016
+++ pkgsrc/math/z3/patches/patch-src_util_debug.cpp     Sat Jul 16 04:02:13 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_util_debug.cpp,v 1.1 2016/07/16 04:02:13 markd Exp $
+
+gcc6 fix
+
+--- src/util/debug.cpp.orig    2015-10-05 12:07:19.000000000 +0000
++++ src/util/debug.cpp
+@@ -76,7 +76,7 @@ void invoke_gdb() {
+     for (;;) {
+         std::cerr << "(C)ontinue, (A)bort, (S)top, (T)hrow exception, Invoke (G)DB\n";
+         char result;
+-        bool ok = (std::cin >> result);
++        bool ok = bool(std::cin >> result);
+         if (!ok) exit(ERR_INTERNAL_FATAL); // happens if std::cin is eof or unattached.
+         switch(result) {
+         case 'C':
Index: pkgsrc/math/z3/patches/patch-src_util_mpz.cpp
diff -u /dev/null pkgsrc/math/z3/patches/patch-src_util_mpz.cpp:1.1
--- /dev/null   Sat Jul 16 04:02:14 2016
+++ pkgsrc/math/z3/patches/patch-src_util_mpz.cpp       Sat Jul 16 04:02:13 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_util_mpz.cpp,v 1.1 2016/07/16 04:02:13 markd Exp $
+
+gcc6 fix
+
+--- src/util/mpz.cpp.orig      2015-10-05 12:07:19.000000000 +0000
++++ src/util/mpz.cpp
+@@ -134,7 +134,7 @@ mpz_manager<SYNCH>::mpz_manager():
+ #endif
+     
+     mpz one(1);
+-    set(m_two64, UINT64_MAX);
++    set(m_two64, (uint64)UINT64_MAX);
+     add(m_two64, one, m_two64);
+ }
+