diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-09-10 10:42:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-10 10:42:05 +0100 |
| commit | 946859e0e36904cffb3e0ccbccb6b7b1347c1cc8 (patch) | |
| tree | 0acec77e64f765c013ceda868659a8e125e429df /eclass | |
| parent | b9baffd9af9383cc886b1583814fe15163017d80 (diff) | |
gentoo auto-resync : 10:09:2022 - 10:42:05
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 36982 -> 36983 bytes | |||
| -rw-r--r-- | eclass/toolchain.eclass | 26 |
2 files changed, 23 insertions, 3 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 7a9b3dcd7a11..d17f60f6018a 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 4a91f0d3dee0..4e023ffb65d0 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -288,6 +288,13 @@ BDEPEND=" )" DEPEND="${RDEPEND}" +if [[ ${PN} == gcc && ${PV} == *_p* ]] ; then + # Snapshots don't contain info pages. + # If they start to, adjust gcc_cv_prog_makeinfo_modern logic in toolchain_src_configure. + # Needed unless/until https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106899 is fixed + BDEPEND+=" sys-apps/texinfo" +fi + if tc_has_feature gcj ; then DEPEND+=" gcj? ( @@ -1417,9 +1424,22 @@ toolchain_src_configure() { ) fi - # Disable gcc info regeneration -- it ships with generated info pages - # already. Our custom version/urls/etc... trigger it. bug #464008 - export gcc_cv_prog_makeinfo_modern=no + if [[ ${PV} != *_p* && -f "${S}"/gcc/doc/gcc.info ]] ; then + # Disable gcc info regeneration -- it ships with generated info pages + # already. Our custom version/urls/etc... trigger it. bug #464008 + export gcc_cv_prog_makeinfo_modern=no + else + # Allow a fallback so we don't accidentally install no docs + # bug #834845 + ewarn "No pre-generated info pages in tarball. Allowing regeneration with texinfo..." + + if [[ ${PV} == *_p* && -f "${S}"/gcc/doc/gcc.info ]] ; then + # Safeguard against https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106899 being fixed + # without corresponding ebuild changes. + eqawarn "Snapshot release with pre-generated info pages found!" + eqawarn "The BDEPEND in the ebuild should be updated to drop texinfo." + fi + fi # Do not let the X detection get in our way. We know things can be found # via system paths, so no need to hardcode things that'll break multilib. |