1 |
commit: 5c888a952dc942822d48a87fae24d36146b9fa87 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 29 08:36:30 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 29 08:48:50 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c888a95 |
7 |
|
8 |
dev-libs/gmp: use 6.2.1 docs (not 6.2.0) as they're released now |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
dev-libs/gmp/Manifest | 2 +- |
13 |
dev-libs/gmp/gmp-6.2.1-r1.ebuild | 23 ++++++++++++++--------- |
14 |
2 files changed, 15 insertions(+), 10 deletions(-) |
15 |
|
16 |
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest |
17 |
index 60d06efdb2e..4db6b7b9674 100644 |
18 |
--- a/dev-libs/gmp/Manifest |
19 |
+++ b/dev-libs/gmp/Manifest |
20 |
@@ -1,2 +1,2 @@ |
21 |
DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 |
22 |
-DIST gmp-man-6.2.0.pdf 828998 BLAKE2B 0bf56bf0a6f1aac0e1fb9a5a37552f846a2d4a01bfd3f5b5c531d42a9afc48c19552e08971785805f59e3f2a5fd89e3f986f841dca2e340813596cfd76574e61 SHA512 25d129efedd329cd2d4535557c6912191f587bfd8ef028618b4ca6199ec7bf7a9ae862e7f5e5b5448c86888452a39fc7bf95cf9c18311858dd1aa9ae1c716239 |
23 |
+DIST gmp-man-6.2.1.pdf 827583 BLAKE2B 9aa25457a3c488e37cc7d54d825253ab749a3780919570579b319cf607001de50b212ca387b70213abcc5ab428b4525bdb9cd8ae932798a2d7928da98ce3f353 SHA512 f2d9d02e97975355ef490e921fedc94fb7687c3661eec8fa2e94a1622b6e59b17b3879eb3ec1f2df8edac100f727175144d107f4c49c602b773c43bc9e91dbcb |
24 |
|
25 |
diff --git a/dev-libs/gmp/gmp-6.2.1-r1.ebuild b/dev-libs/gmp/gmp-6.2.1-r1.ebuild |
26 |
index 46b021bec16..2b5f277c706 100644 |
27 |
--- a/dev-libs/gmp/gmp-6.2.1-r1.ebuild |
28 |
+++ b/dev-libs/gmp/gmp-6.2.1-r1.ebuild |
29 |
@@ -7,8 +7,8 @@ inherit flag-o-matic libtool multilib-minimal toolchain-funcs |
30 |
|
31 |
MY_PV=${PV/_p*} |
32 |
MY_PV=${MY_PV/_/-} |
33 |
-MANUAL_PV=$MY_PV |
34 |
-MANUAL_PV=6.2.0 # 6.2.1 manual is not ready yet |
35 |
+MANUAL_PV=${MY_PV} |
36 |
+MANUAL_PV=6.2.1 |
37 |
MY_P=${PN}-${MY_PV} |
38 |
PLEVEL=${PV/*p} |
39 |
DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers" |
40 |
@@ -40,10 +40,10 @@ PATCHES=( |
41 |
src_prepare() { |
42 |
default |
43 |
|
44 |
- # note: we cannot run autotools here as gcc depends on this package |
45 |
+ # We cannot run autotools here as gcc depends on this package |
46 |
elibtoolize |
47 |
|
48 |
- # https://bugs.gentoo.org/536894 |
49 |
+ # bug #536894 |
50 |
if [[ ${CHOST} == *-darwin* ]] ; then |
51 |
eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch |
52 |
fi |
53 |
@@ -55,6 +55,7 @@ src_prepare() { |
54 |
#!/usr/bin/env sh |
55 |
exec env ABI="${GMPABI}" "$0.wrapped" "$@" |
56 |
EOF |
57 |
+ |
58 |
# Patches to original configure might have lost the +x bit. |
59 |
chmod a+rx configure{,.wrapped} || die |
60 |
} |
61 |
@@ -74,14 +75,15 @@ multilib_src_configure() { |
62 |
esac |
63 |
export GMPABI |
64 |
|
65 |
- #367719 |
66 |
+ # bug #367719 |
67 |
if [[ ${CHOST} == *-mint* ]]; then |
68 |
filter-flags -O? |
69 |
fi |
70 |
|
71 |
+ tc-export CC |
72 |
+ |
73 |
# --with-pic forces static libraries to be built as PIC |
74 |
# and without TEXTRELs. musl does not support TEXTRELs: bug #707332 |
75 |
- tc-export CC |
76 |
ECONF_SOURCE="${S}" econf \ |
77 |
CC_FOR_BUILD="$(tc-getBUILD_CC)" \ |
78 |
--localstatedir="${EPREFIX}"/var/state/gmp \ |
79 |
@@ -95,11 +97,14 @@ multilib_src_configure() { |
80 |
multilib_src_install() { |
81 |
emake DESTDIR="${D}" install |
82 |
|
83 |
- # should be a standalone lib |
84 |
+ # Should be a standalone lib |
85 |
rm -f "${ED}"/usr/$(get_libdir)/libgmp.la |
86 |
- # this requires libgmp |
87 |
+ |
88 |
+ # This requires libgmp |
89 |
local la="${ED}/usr/$(get_libdir)/libgmpxx.la" |
90 |
- use static-libs || rm -f "${la}" |
91 |
+ if ! use static-libs ; then |
92 |
+ rm -f "${la}" |
93 |
+ fi |
94 |
} |
95 |
|
96 |
multilib_src_install_all() { |