[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/files/

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/files/

[David Seifert]

commit:     fde0c83ed8ba832ac37743a2b478f36fc92f8c52
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug  9 09:39:35 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 11:24:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde0c83e

sci-mathematics/z3: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/5370

 sci-mathematics/z3/files/z3-4.1.2-configure.patch | 76 -----------------------
 1 file changed, 76 deletions(-)

diff --git a/sci-mathematics/z3/files/z3-4.1.2-configure.patch b/sci-mathematics/z3/files/z3-4.1.2-configure.patch
deleted file mode 100644
index 08ace2b697d..00000000000
--- a/sci-mathematics/z3/files/z3-4.1.2-configure.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- z3-orig/configure.in	2012-10-04 16:41:04.000000000 +1000
-+++ z3/configure.in	2012-10-18 15:56:49.895967069 +1100
-@@ -22,20 +22,29 @@
- 
- host_os=`uname -s`
- 
-+AC_ARG_ENABLE([static],
-+[ --disable-static disable static],
-+[static=${enableval}], [static=yes])
-+
-+if test "$static" = "yes"; then
-+  STATIC_FLAGS=-static
-+else
-+  STATIC_FLAGS=
-+fi
-+
- AS_IF([test "$host_os" = "Darwin"], [
-   PLATFORM=osx
-   SO_EXT=dylib
--  SLIBFLAGS="-dynamiclib -fopenmp"
-+  LDFLAGS="${LDFLAGS}"
-+  SLIBFLAGS="${LDFLAGS} -dynamiclib -fopenmp"
-   COMP_VERSIONS="-compatibility_version \$(Z3_VERSION) -current_version \$(Z3_VERSION)"
--  STATIC_FLAGS=
-   CPPFLAGS+=" -mmacosx-version-min=10.4"
- ], [test "$host_os" = "Linux"], [
-   PLATFORM=linux
--  SO_EXT=so
--  LDFLAGS=-lrt
--  SLIBFLAGS="-shared -fopenmp"
-+  SO_EXT=so.1.0
-+  LDFLAGS="${LDFLAGS} -lrt"
-+  SLIBFLAGS="${LDFLAGS} -shared -fopenmp"
-   COMP_VERSIONS=
--  STATIC_FLAGS=-static
- ], [
-   AC_MSG_ERROR([Unknown host platform: $host_os])
- ])
-@@ -88,15 +97,17 @@
-    AC_CHECK_LIB(gmp, __gmpz_cmp, LIBS="-lgmp $LIBS", AC_MSG_ERROR([GMP library not found]))
-    dnl Look for libgmp.a at /usr/local/lib and /usr/lib
-    dnl TODO: make the following test more robust...
--   if test -e /usr/local/lib/libgmp.a; then
--      GMP_STATIC_LIB="/usr/local/lib/libgmp.a"
--   else if test -e /usr/lib/libgmp.a; then
--      GMP_STATIC_LIB="/usr/lib/libgmp.a"
--   else if test -e /usr/lib/libgmp.dll.a; then
--      GMP_STATIC_LIB="/usr/lib/libgmp.dll.a"
--   else
--      AC_MSG_ERROR([Failed to find libgmp.a])   
--   fi fi fi
-+   if test "$static" = "yes"; then
-+      if test -e /usr/local/lib/libgmp.a; then
-+         GMP_STATIC_LIB="/usr/local/lib/libgmp.a"
-+       else if test -e /usr/lib/libgmp.a; then
-+         GMP_STATIC_LIB="/usr/lib/libgmp.a"
-+       else if test -e /usr/lib/libgmp.dll.a; then
-+         GMP_STATIC_LIB="/usr/lib/libgmp.dll.a"
-+       else
-+         AC_MSG_ERROR([Failed to find libgmp.a])   
-+       fi fi fi
-+   fi
- fi
- 
- AC_PROG_CXXCPP
---- z3-orig/Makefile.in	2012-10-04 16:41:02.000000000 +1000
-+++ z3/Makefile.in	2012-10-18 15:25:00.716162723 +1100
-@@ -175,7 +175,7 @@
- 
- $(BIN_DIR)/lib$(Z3).@SO_EXT@: $(OBJ_DIR) $(BIN_DIR) $(LIB_OBJS)
- 	@mkdir -p $(BIN_DIR)
--	$(CXX) -o $(BIN_DIR)/lib$(Z3).@SO_EXT@  $(LIB_OBJS) $(LIBFLAGS) $(LIBS) @COMP_VERSIONS@
-+	$(CXX) -Wl,-soname=lib$(Z3).@SO_EXT@ -o $(BIN_DIR)/lib$(Z3).@SO_EXT@  $(LIB_OBJS) $(LIBFLAGS) $(LIBS) @COMP_VERSIONS@
- 
- $(BIN_DIR)/lib$(Z3).a: $(OBJ_DIR) $(BIN_DIR) $(LIB_OBJS)
- 	@mkdir -p $(BIN_DIR)

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/files/

[Aaron Bauman]

commit:     749baee0da82080e32434b53b92a1c4db5afc4dc
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Dec 12 20:47:17 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 20:52:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=749baee0

sci-mathematics/z3: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13960
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch b/sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch
deleted file mode 100644
index 2dc0ddd12f2..00000000000
--- a/sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/util/debug.cpp b/src/util/debug.cpp
-index 54c67fe..66676c6 100644
---- a/src/util/debug.cpp
-+++ b/src/util/debug.cpp
-@@ -78,3 +78,3 @@ void invoke_gdb() {
-         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.
-diff --git a/src/util/mpz.cpp b/src/util/mpz.cpp
-index 8559279..7dca14b 100644
---- a/src/util/mpz.cpp
-+++ b/src/util/mpz.cpp
-@@ -136,3 +136,3 @@ mpz_manager<SYNCH>::mpz_manager():
-     mpz one(1);
--    set(m_two64, UINT64_MAX);
-+    set(m_two64, (uint64)UINT64_MAX);
-     add(m_two64, one, m_two64);