Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/files/
Date: Sun, 13 Aug 2017 11:25:14
Message-Id: 1502623479.fde0c83ed8ba832ac37743a2b478f36fc92f8c52.soap@gentoo
1 commit: fde0c83ed8ba832ac37743a2b478f36fc92f8c52
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Aug 9 09:39:35 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 13 11:24:39 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde0c83e
7
8 sci-mathematics/z3: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/5370
11
12 sci-mathematics/z3/files/z3-4.1.2-configure.patch | 76 -----------------------
13 1 file changed, 76 deletions(-)
14
15 diff --git a/sci-mathematics/z3/files/z3-4.1.2-configure.patch b/sci-mathematics/z3/files/z3-4.1.2-configure.patch
16 deleted file mode 100644
17 index 08ace2b697d..00000000000
18 --- a/sci-mathematics/z3/files/z3-4.1.2-configure.patch
19 +++ /dev/null
20 @@ -1,76 +0,0 @@
21 ---- z3-orig/configure.in 2012-10-04 16:41:04.000000000 +1000
22 -+++ z3/configure.in 2012-10-18 15:56:49.895967069 +1100
23 -@@ -22,20 +22,29 @@
24 -
25 - host_os=`uname -s`
26 -
27 -+AC_ARG_ENABLE([static],
28 -+[ --disable-static disable static],
29 -+[static=${enableval}], [static=yes])
30 -+
31 -+if test "$static" = "yes"; then
32 -+ STATIC_FLAGS=-static
33 -+else
34 -+ STATIC_FLAGS=
35 -+fi
36 -+
37 - AS_IF([test "$host_os" = "Darwin"], [
38 - PLATFORM=osx
39 - SO_EXT=dylib
40 -- SLIBFLAGS="-dynamiclib -fopenmp"
41 -+ LDFLAGS="${LDFLAGS}"
42 -+ SLIBFLAGS="${LDFLAGS} -dynamiclib -fopenmp"
43 - COMP_VERSIONS="-compatibility_version \$(Z3_VERSION) -current_version \$(Z3_VERSION)"
44 -- STATIC_FLAGS=
45 - CPPFLAGS+=" -mmacosx-version-min=10.4"
46 - ], [test "$host_os" = "Linux"], [
47 - PLATFORM=linux
48 -- SO_EXT=so
49 -- LDFLAGS=-lrt
50 -- SLIBFLAGS="-shared -fopenmp"
51 -+ SO_EXT=so.1.0
52 -+ LDFLAGS="${LDFLAGS} -lrt"
53 -+ SLIBFLAGS="${LDFLAGS} -shared -fopenmp"
54 - COMP_VERSIONS=
55 -- STATIC_FLAGS=-static
56 - ], [
57 - AC_MSG_ERROR([Unknown host platform: $host_os])
58 - ])
59 -@@ -88,15 +97,17 @@
60 - AC_CHECK_LIB(gmp, __gmpz_cmp, LIBS="-lgmp $LIBS", AC_MSG_ERROR([GMP library not found]))
61 - dnl Look for libgmp.a at /usr/local/lib and /usr/lib
62 - dnl TODO: make the following test more robust...
63 -- if test -e /usr/local/lib/libgmp.a; then
64 -- GMP_STATIC_LIB="/usr/local/lib/libgmp.a"
65 -- else if test -e /usr/lib/libgmp.a; then
66 -- GMP_STATIC_LIB="/usr/lib/libgmp.a"
67 -- else if test -e /usr/lib/libgmp.dll.a; then
68 -- GMP_STATIC_LIB="/usr/lib/libgmp.dll.a"
69 -- else
70 -- AC_MSG_ERROR([Failed to find libgmp.a])
71 -- fi fi fi
72 -+ if test "$static" = "yes"; then
73 -+ if test -e /usr/local/lib/libgmp.a; then
74 -+ GMP_STATIC_LIB="/usr/local/lib/libgmp.a"
75 -+ else if test -e /usr/lib/libgmp.a; then
76 -+ GMP_STATIC_LIB="/usr/lib/libgmp.a"
77 -+ else if test -e /usr/lib/libgmp.dll.a; then
78 -+ GMP_STATIC_LIB="/usr/lib/libgmp.dll.a"
79 -+ else
80 -+ AC_MSG_ERROR([Failed to find libgmp.a])
81 -+ fi fi fi
82 -+ fi
83 - fi
84 -
85 - AC_PROG_CXXCPP
86 ---- z3-orig/Makefile.in 2012-10-04 16:41:02.000000000 +1000
87 -+++ z3/Makefile.in 2012-10-18 15:25:00.716162723 +1100
88 -@@ -175,7 +175,7 @@
89 -
90 - $(BIN_DIR)/lib$(Z3).@SO_EXT@: $(OBJ_DIR) $(BIN_DIR) $(LIB_OBJS)
91 - @mkdir -p $(BIN_DIR)
92 -- $(CXX) -o $(BIN_DIR)/lib$(Z3).@SO_EXT@ $(LIB_OBJS) $(LIBFLAGS) $(LIBS) @COMP_VERSIONS@
93 -+ $(CXX) -Wl,-soname=lib$(Z3).@SO_EXT@ -o $(BIN_DIR)/lib$(Z3).@SO_EXT@ $(LIB_OBJS) $(LIBFLAGS) $(LIBS) @COMP_VERSIONS@
94 -
95 - $(BIN_DIR)/lib$(Z3).a: $(OBJ_DIR) $(BIN_DIR) $(LIB_OBJS)
96 - @mkdir -p $(BIN_DIR)