1 |
commit: 5611be3c721cc728c358b353c1041586ae337ecb |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 1 20:25:04 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 1 20:39:52 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5611be3c |
7 |
|
8 |
dev-libs/mpc: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
12 |
|
13 |
dev-libs/mpc/Manifest | 1 - |
14 |
dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch | 129 -------------------------- |
15 |
dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch | 25 ----- |
16 |
dev-libs/mpc/mpc-1.0.3-r2.ebuild | 39 -------- |
17 |
dev-libs/mpc/mpc-1.0.3.ebuild | 33 ------- |
18 |
5 files changed, 227 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest |
21 |
index f0edc3d40fb..77c563eae9d 100644 |
22 |
--- a/dev-libs/mpc/Manifest |
23 |
+++ b/dev-libs/mpc/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4303d0a31e809d649897bc3547e9b06271dae4e80be569ee67e2a84f86b662e05dac0ca36ff87e95fcbd62 SHA512 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43 |
26 |
DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628 |
27 |
|
28 |
diff --git a/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch b/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch |
29 |
deleted file mode 100644 |
30 |
index 3a62d9bd20a..00000000000 |
31 |
--- a/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch |
32 |
+++ /dev/null |
33 |
@@ -1,129 +0,0 @@ |
34 |
-https://bugs.gentoo.org/642300 |
35 |
- |
36 |
-From 36a84f43f326de14db888ba07936cc9621c23f19 Mon Sep 17 00:00:00 2001 |
37 |
-From: Paul Zimmermann <Paul.Zimmermann@×××××.fr> |
38 |
-Date: Sun, 10 Jan 2016 23:19:37 +0100 |
39 |
-Subject: [PATCH] use mpfr_fmma and mpfr_fmms if provided by mpfr |
40 |
- |
41 |
---- |
42 |
- configure.ac | 16 ++++++++++++++++ |
43 |
- src/mul.c | 15 ++++++++++++--- |
44 |
- 2 files changed, 28 insertions(+), 3 deletions(-) |
45 |
- |
46 |
-diff --git a/configure.ac b/configure.ac |
47 |
-index b6fa199..bdb21ff 100644 |
48 |
---- a/configure.ac |
49 |
-+++ b/configure.ac |
50 |
-@@ -165,6 +165,22 @@ AC_LINK_IFELSE( |
51 |
- AC_MSG_ERROR([libmpfr not found or uses a different ABI (including static vs shared).]) |
52 |
- ]) |
53 |
- |
54 |
-+AC_MSG_CHECKING(for mpfr_fmma) |
55 |
-+LIBS="-lmpfr $LIBS" |
56 |
-+AC_LINK_IFELSE( |
57 |
-+ [AC_LANG_PROGRAM( |
58 |
-+ [[#include "mpfr.h"]], |
59 |
-+ [[mpfr_t x; mpfr_fmma (x, x, x, x, x, 0);]] |
60 |
-+ )], |
61 |
-+ [ |
62 |
-+ AC_MSG_RESULT(yes) |
63 |
-+ AC_DEFINE(HAVE_MPFR_FMMA, 1, [mpfr_fmma is present]) |
64 |
-+ ], |
65 |
-+ [ |
66 |
-+ AC_MSG_RESULT(no) |
67 |
-+ AC_DEFINE(HAVE_MPFR_FMMA, 0, [mpfr_fmma is not present]) |
68 |
-+ ]) |
69 |
-+ |
70 |
- # Check for a recent GMP |
71 |
- # We only guarantee that with a *functional* and recent enough GMP version, |
72 |
- # MPC will compile; we do not guarantee that GMP will compile. |
73 |
-diff --git a/src/mul.c b/src/mul.c |
74 |
-index 3c9c0a7..8c4afe4 100644 |
75 |
---- a/src/mul.c |
76 |
-+++ b/src/mul.c |
77 |
-@@ -171,8 +171,9 @@ |
78 |
- } |
79 |
- |
80 |
- |
81 |
-+#if HAVE_MPFR_FMMA == 0 |
82 |
- static int |
83 |
--mpfr_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c, |
84 |
-+mpc_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c, |
85 |
- mpfr_srcptr d, int sign, mpfr_rnd_t rnd) |
86 |
- { |
87 |
- /* Computes z = ab+cd if sign >= 0, or z = ab-cd if sign < 0. |
88 |
-@@ -319,6 +320,7 @@ |
89 |
- |
90 |
- return inex; |
91 |
- } |
92 |
-+#endif |
93 |
- |
94 |
- |
95 |
- int |
96 |
-@@ -337,10 +339,17 @@ |
97 |
- else |
98 |
- rop [0] = z [0]; |
99 |
- |
100 |
-- inex = MPC_INEX (mpfr_fmma (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x), |
101 |
-- mpc_imagref (y), -1, MPC_RND_RE (rnd)), |
102 |
-+#if HAVE_MPFR_FMMA |
103 |
-+ inex = MPC_INEX (mpfr_fmms (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x), |
104 |
-+ mpc_imagref (y), MPC_RND_RE (rnd)), |
105 |
- mpfr_fmma (mpc_imagref (rop), mpc_realref (x), mpc_imagref (y), mpc_imagref (x), |
106 |
-+ mpc_realref (y), MPC_RND_IM (rnd))); |
107 |
-+#else |
108 |
-+ inex = MPC_INEX (mpc_fmma (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x), |
109 |
-+ mpc_imagref (y), -1, MPC_RND_RE (rnd)), |
110 |
-+ mpc_fmma (mpc_imagref (rop), mpc_realref (x), mpc_imagref (y), mpc_imagref (x), |
111 |
- mpc_realref (y), +1, MPC_RND_IM (rnd))); |
112 |
-+#endif |
113 |
- |
114 |
- mpc_set (z, rop, MPC_RNDNN); |
115 |
- if (overlap) |
116 |
---- a/configure |
117 |
-+++ b/configure |
118 |
-@@ -13835,6 +13835,41 @@ else |
119 |
- $as_echo "no" >&6; } |
120 |
- as_fn_error $? "libmpfr not found or uses a different ABI (including static vs shared)." "$LINENO" 5 |
121 |
- |
122 |
-+fi |
123 |
-+rm -f core conftest.err conftest.$ac_objext \ |
124 |
-+ conftest$ac_exeext conftest.$ac_ext |
125 |
-+ |
126 |
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpfr_fmma" >&5 |
127 |
-+$as_echo_n "checking for mpfr_fmma... " >&6; } |
128 |
-+LIBS="-lmpfr $LIBS" |
129 |
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
130 |
-+/* end confdefs.h. */ |
131 |
-+#include "mpfr.h" |
132 |
-+int |
133 |
-+main () |
134 |
-+{ |
135 |
-+mpfr_t x; mpfr_fmma (x, x, x, x, x, 0); |
136 |
-+ |
137 |
-+ ; |
138 |
-+ return 0; |
139 |
-+} |
140 |
-+_ACEOF |
141 |
-+if ac_fn_c_try_link "$LINENO"; then : |
142 |
-+ |
143 |
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
144 |
-+$as_echo "yes" >&6; } |
145 |
-+ |
146 |
-+$as_echo "#define HAVE_MPFR_FMMA 1" >>confdefs.h |
147 |
-+ |
148 |
-+ |
149 |
-+else |
150 |
-+ |
151 |
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
152 |
-+$as_echo "no" >&6; } |
153 |
-+ |
154 |
-+$as_echo "#define HAVE_MPFR_FMMA 0" >>confdefs.h |
155 |
-+ |
156 |
-+ |
157 |
- fi |
158 |
- rm -f core conftest.err conftest.$ac_objext \ |
159 |
- conftest$ac_exeext conftest.$ac_ext |
160 |
--- |
161 |
-2.15.1 |
162 |
- |
163 |
|
164 |
diff --git a/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch b/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch |
165 |
deleted file mode 100644 |
166 |
index 445e9419103..00000000000 |
167 |
--- a/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch |
168 |
+++ /dev/null |
169 |
@@ -1,25 +0,0 @@ |
170 |
-mpfr-4.0.0 removed 'mpfr_add_one_ulp' and 'mpfr_sub_one_ulp' |
171 |
- |
172 |
-From 5eaa17651b759c7856a118835802fecbebcf46ad Mon Sep 17 00:00:00 2001 |
173 |
-From: Paul Zimmermann <Paul.Zimmermann@×××××.fr> |
174 |
-Date: Wed, 4 Oct 2017 22:09:40 +0200 |
175 |
-Subject: [PATCH] replace obsolete mpfr_add_one_ulp/mpfr_sub_one_ulp functions |
176 |
- |
177 |
---- |
178 |
- src/mpc-impl.h | 6 ++++-- |
179 |
- 1 file changed, 4 insertions(+), 2 deletions(-) |
180 |
- |
181 |
-diff --git a/src/mpc-impl.h b/src/mpc-impl.h |
182 |
-index 4026765..5420691 100644 |
183 |
---- a/src/mpc-impl.h |
184 |
-+++ b/src/mpc-impl.h |
185 |
-@@ -60,2 +60,4 @@ along with this program. If not, see http://www.gnu.org/licenses/ . |
186 |
--#define MPFR_ADD_ONE_ULP(x) mpfr_add_one_ulp (x, GMP_RNDN) |
187 |
--#define MPFR_SUB_ONE_ULP(x) mpfr_sub_one_ulp (x, GMP_RNDN) |
188 |
-+#define MPFR_ADD_ONE_ULP(x) \ |
189 |
-+ (mpfr_sgn (x) > 0 ? mpfr_nextabove (x) : mpfr_nextbelow (x)) |
190 |
-+#define MPFR_SUB_ONE_ULP(x) \ |
191 |
-+ (mpfr_sgn (x) > 0 ? mpfr_nextbelow (x) : mpfr_nextabove (x)) |
192 |
--- |
193 |
-2.15.1 |
194 |
- |
195 |
|
196 |
diff --git a/dev-libs/mpc/mpc-1.0.3-r2.ebuild b/dev-libs/mpc/mpc-1.0.3-r2.ebuild |
197 |
deleted file mode 100644 |
198 |
index 45deed7ff1e..00000000000 |
199 |
--- a/dev-libs/mpc/mpc-1.0.3-r2.ebuild |
200 |
+++ /dev/null |
201 |
@@ -1,39 +0,0 @@ |
202 |
-# Copyright 1999-2020 Gentoo Authors |
203 |
-# Distributed under the terms of the GNU General Public License v2 |
204 |
- |
205 |
-EAPI=6 |
206 |
- |
207 |
-inherit eutils libtool ltprune multilib-minimal |
208 |
- |
209 |
-DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding" |
210 |
-HOMEPAGE="http://mpc.multiprecision.org/" |
211 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
212 |
- |
213 |
-LICENSE="LGPL-2.1" |
214 |
-SLOT="0/3" |
215 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
216 |
-IUSE="static-libs" |
217 |
- |
218 |
-DEPEND=">=dev-libs/gmp-4.3.2:0=[${MULTILIB_USEDEP},static-libs?] |
219 |
- >=dev-libs/mpfr-2.4.2:0=[${MULTILIB_USEDEP},static-libs?]" |
220 |
-RDEPEND="${DEPEND}" |
221 |
- |
222 |
-PATCHES=( |
223 |
- "${FILESDIR}"/${P}-mpfr-4.0.0.patch |
224 |
- "${FILESDIR}"/${P}-no-ulp.patch |
225 |
-) |
226 |
- |
227 |
-src_prepare() { |
228 |
- default |
229 |
- |
230 |
- elibtoolize #347317 |
231 |
-} |
232 |
- |
233 |
-multilib_src_configure() { |
234 |
- ECONF_SOURCE=${S} econf $(use_enable static-libs static) |
235 |
-} |
236 |
- |
237 |
-multilib_src_install_all() { |
238 |
- einstalldocs |
239 |
- prune_libtool_files |
240 |
-} |
241 |
|
242 |
diff --git a/dev-libs/mpc/mpc-1.0.3.ebuild b/dev-libs/mpc/mpc-1.0.3.ebuild |
243 |
deleted file mode 100644 |
244 |
index 7219b432677..00000000000 |
245 |
--- a/dev-libs/mpc/mpc-1.0.3.ebuild |
246 |
+++ /dev/null |
247 |
@@ -1,33 +0,0 @@ |
248 |
-# Copyright 1999-2020 Gentoo Authors |
249 |
-# Distributed under the terms of the GNU General Public License v2 |
250 |
- |
251 |
-EAPI="4" |
252 |
- |
253 |
-inherit eutils libtool ltprune multilib-minimal |
254 |
- |
255 |
-DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding" |
256 |
-HOMEPAGE="http://mpc.multiprecision.org/" |
257 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
258 |
- |
259 |
-LICENSE="LGPL-2.1" |
260 |
-SLOT="0" |
261 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
262 |
-IUSE="static-libs" |
263 |
- |
264 |
-DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?] |
265 |
- >=dev-libs/mpfr-2.4.2[${MULTILIB_USEDEP},static-libs?] |
266 |
- <dev-libs/mpfr-4.0.0" |
267 |
-RDEPEND="${DEPEND}" |
268 |
- |
269 |
-src_prepare() { |
270 |
- elibtoolize #347317 |
271 |
-} |
272 |
- |
273 |
-multilib_src_configure() { |
274 |
- ECONF_SOURCE=${S} econf $(use_enable static-libs static) |
275 |
-} |
276 |
- |
277 |
-multilib_src_install_all() { |
278 |
- einstalldocs |
279 |
- prune_libtool_files |
280 |
-} |