| 1 |
commit: 01b37fc251ee234dec9c6c63ab6fad1e8a5626ef |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 7 18:29:30 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 7 18:29:30 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b37fc2 |
| 7 |
|
| 8 |
dev-libs/mpfr: Don't call makeinfo, forbidden during bootstrap |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 11 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 12 |
|
| 13 |
...mpfr-4.1.0_p13-revert-doc-changes-patch10.patch | 105 --------------------- |
| 14 |
dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild | 13 ++- |
| 15 |
2 files changed, 9 insertions(+), 109 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/mpfr/files/mpfr-4.1.0_p13-revert-doc-changes-patch10.patch b/dev-libs/mpfr/files/mpfr-4.1.0_p13-revert-doc-changes-patch10.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 304cc27f3fa..00000000000 |
| 20 |
--- a/dev-libs/mpfr/files/mpfr-4.1.0_p13-revert-doc-changes-patch10.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,105 +0,0 @@ |
| 23 |
-From: Sam James <sam@g.o> |
| 24 |
-Date: Sat, 6 Nov 2021 00:34:22 +0000 |
| 25 |
-Subject: [PATCH] Revert doc changes from mpfr-4.1.0-patch10 |
| 26 |
- |
| 27 |
-We don't want to invoke texinfo via maintainer-mode because |
| 28 |
-of some (somewhat minor) changes to the manual from patch10. |
| 29 |
- |
| 30 |
-See: https://archives.gentoo.org/gentoo-releng-autobuilds/message/c2dd39fc4ebc849db6bb0f551739e2ed |
| 31 |
-Signed-off-by: Sam James <sam@g.o> |
| 32 |
---- |
| 33 |
- doc/mpfr.info | 46 +++++++++++++++++++++------------------------- |
| 34 |
- doc/mpfr.texi | 6 ------ |
| 35 |
- 2 files changed, 21 insertions(+), 31 deletions(-) |
| 36 |
- |
| 37 |
-diff --git a/doc/mpfr.info b/doc/mpfr.info |
| 38 |
-index 062c0c4..264896d 100644 |
| 39 |
---- a/doc/mpfr.info |
| 40 |
-+++ b/doc/mpfr.info |
| 41 |
-@@ -3217,11 +3217,7 @@ destroying, garbaging) is left to the application. |
| 42 |
- |
| 43 |
- Each function in this interface is also implemented as a macro for |
| 44 |
- efficiency reasons: for example ‘mpfr_custom_init (s, p)’ uses the |
| 45 |
--macro, while ‘(mpfr_custom_init) (s, p)’ uses the function. Note that |
| 46 |
--the macro may evaluate arguments multiple times (or none). Moreover, |
| 47 |
--macros implementing functions with the ‘void’ return type may not be |
| 48 |
--used in contexts where an expression is expected, e.g., inside |
| 49 |
--‘for(...)’ or before a comma operator. |
| 50 |
-+macro, while ‘(mpfr_custom_init) (s, p)’ uses the function. |
| 51 |
- |
| 52 |
- Note 1: MPFR functions may still initialize temporary floating-point |
| 53 |
- numbers using ‘mpfr_init’ and similar functions. See Custom Allocation |
| 54 |
-@@ -4583,13 +4579,13 @@ Function and Type Index |
| 55 |
- (line 115) |
| 56 |
- * mpfr_csch: Transcendental Functions. |
| 57 |
- (line 180) |
| 58 |
--* mpfr_custom_get_exp: Custom Interface. (line 80) |
| 59 |
--* mpfr_custom_get_kind: Custom Interface. (line 70) |
| 60 |
--* mpfr_custom_get_significand: Custom Interface. (line 75) |
| 61 |
--* mpfr_custom_get_size: Custom Interface. (line 41) |
| 62 |
--* mpfr_custom_init: Custom Interface. (line 45) |
| 63 |
--* mpfr_custom_init_set: Custom Interface. (line 52) |
| 64 |
--* mpfr_custom_move: Custom Interface. (line 89) |
| 65 |
-+* mpfr_custom_get_exp: Custom Interface. (line 76) |
| 66 |
-+* mpfr_custom_get_kind: Custom Interface. (line 66) |
| 67 |
-+* mpfr_custom_get_significand: Custom Interface. (line 71) |
| 68 |
-+* mpfr_custom_get_size: Custom Interface. (line 37) |
| 69 |
-+* mpfr_custom_init: Custom Interface. (line 41) |
| 70 |
-+* mpfr_custom_init_set: Custom Interface. (line 48) |
| 71 |
-+* mpfr_custom_move: Custom Interface. (line 85) |
| 72 |
- * MPFR_DECL_INIT: Initialization Functions. |
| 73 |
- (line 77) |
| 74 |
- * mpfr_digamma: Transcendental Functions. |
| 75 |
-@@ -5169,19 +5165,19 @@ Node: Exception Related Functions145661 |
| 76 |
- Node: Memory Handling Functions155904 |
| 77 |
- Node: Compatibility with MPF157792 |
| 78 |
- Node: Custom Interface160961 |
| 79 |
--Node: Internals165852 |
| 80 |
--Node: API Compatibility167396 |
| 81 |
--Node: Type and Macro Changes169344 |
| 82 |
--Node: Added Functions172527 |
| 83 |
--Node: Changed Functions177334 |
| 84 |
--Node: Removed Functions184693 |
| 85 |
--Node: Other Changes185423 |
| 86 |
--Node: MPFR and the IEEE 754 Standard187124 |
| 87 |
--Node: Contributors189741 |
| 88 |
--Node: References192880 |
| 89 |
--Node: GNU Free Documentation License194761 |
| 90 |
--Node: Concept Index217355 |
| 91 |
--Node: Function and Type Index223428 |
| 92 |
-+Node: Internals165592 |
| 93 |
-+Node: API Compatibility167136 |
| 94 |
-+Node: Type and Macro Changes169084 |
| 95 |
-+Node: Added Functions172267 |
| 96 |
-+Node: Changed Functions177074 |
| 97 |
-+Node: Removed Functions184433 |
| 98 |
-+Node: Other Changes185163 |
| 99 |
-+Node: MPFR and the IEEE 754 Standard186864 |
| 100 |
-+Node: Contributors189481 |
| 101 |
-+Node: References192620 |
| 102 |
-+Node: GNU Free Documentation License194501 |
| 103 |
-+Node: Concept Index217095 |
| 104 |
-+Node: Function and Type Index223168 |
| 105 |
- |
| 106 |
- End Tag Table |
| 107 |
- |
| 108 |
-diff --git a/doc/mpfr.texi b/doc/mpfr.texi |
| 109 |
-index b26555a..54b6aa8 100644 |
| 110 |
---- a/doc/mpfr.texi |
| 111 |
-+++ b/doc/mpfr.texi |
| 112 |
-@@ -3817,12 +3817,6 @@ to the application. |
| 113 |
- Each function in this interface is also implemented as a macro for |
| 114 |
- efficiency reasons: for example @code{mpfr_custom_init (s, p)} |
| 115 |
- uses the macro, while @code{(mpfr_custom_init) (s, p)} uses the function. |
| 116 |
--Note that the macro may evaluate arguments multiple times (or none). |
| 117 |
--Moreover, macros implementing functions with the @code{void} return type |
| 118 |
--may not be used in contexts where an expression is expected, e.g., inside |
| 119 |
--@code{for(...)} or before a comma operator. |
| 120 |
--@c These limitations with macros cannot be avoided in a C90 compatible way. |
| 121 |
--@c In the future, inline functions could be used. |
| 122 |
- |
| 123 |
- Note 1: MPFR functions may still initialize temporary floating-point numbers |
| 124 |
- using @code{mpfr_init} and similar functions. See Custom Allocation (GNU MP)@. |
| 125 |
--- |
| 126 |
-2.33.1 |
| 127 |
- |
| 128 |
|
| 129 |
diff --git a/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild |
| 130 |
index 5907ed5bf1a..14639036b47 100644 |
| 131 |
--- a/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild |
| 132 |
+++ b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild |
| 133 |
@@ -47,14 +47,19 @@ PATCHES=() |
| 134 |
if [[ ${PV} == *_p* ]] ; then |
| 135 |
# Apply the upstream patches released out of band |
| 136 |
PATCHES+=( "${DISTDIR}"/ ) |
| 137 |
- |
| 138 |
- # One-off partial revert of 4.1.0_p13's patch10 |
| 139 |
- # Won't be needed on next release. |
| 140 |
- PATCHES+=( "${FILESDIR}"/${P}-revert-doc-changes-patch10.patch ) |
| 141 |
fi |
| 142 |
|
| 143 |
HTML_DOCS=( doc/FAQ.html ) |
| 144 |
|
| 145 |
+src_prepare() { |
| 146 |
+ default |
| 147 |
+ |
| 148 |
+ # 4.1.0_p13's patch10 patches a .texi file *and* the corresponding |
| 149 |
+ # info file. We need to make sure the info file is newer, so the |
| 150 |
+ # build doesn't try to run makeinfo. Won't be needed on next release. |
| 151 |
+ touch "${S}/doc/mpfr.info" || die |
| 152 |
+} |
| 153 |
+ |
| 154 |
multilib_src_configure() { |
| 155 |
# bug 476336#19 |
| 156 |
# Make sure mpfr doesn't go probing toolchains it shouldn't |
Archives