Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 564160 Details for
Bug 677458
toolchain-binutils.eclass: do not build the docs if the doc USE flag is not set!
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for toolchain-binutils.eclass
toolchain-binutils.eclass.patch (text/plain), 3.30 KB, created by
segmentation fault
on 2019-02-07 22:45:36 UTC
(
hide
)
Description:
Patch for toolchain-binutils.eclass
Filename:
MIME Type:
Creator:
segmentation fault
Created:
2019-02-07 22:45:36 UTC
Size:
3.30 KB
patch
obsolete
>--- /usr/portage/eclass/toolchain-binutils.eclass 2018-08-15 10:04:34.000000000 +0200 >+++ /usr/portage/eclass/toolchain-binutils.eclass.copy 2019-02-07 23:28:53.438485912 +0100 >@@ -122,6 +122,30 @@ > unpacker ${A} > mkdir -p "${MY_BUILDDIR}" > [[ -d ${WORKDIR}/patch ]] && mkdir "${WORKDIR}"/patch/skip >+ >+ # Prevent 'make info' if doc is unset. >+ if ! use doc ; then >+ # DELETE the 'doc' subdirectories! >+ # This is radical, but is the only way to avoid things like >+ # the creation of the 'chew' program with the purpose of >+ # 'chewing' documenbtation (before spitting it, that is...). >+ # The problem with programs created during compile time, >+ # like chew (in the bfd dir) is: THEY WILL *NOT* RUN! >+ # I REPEAT: THEY WILL NOT RUN - if we are cross-compiling... >+ # Whoever found it necessary to create such programs >+ # during compilation of binutils is an IDIOT! >+ for subdir in $(find ${WORKDIR}/ -type d -name 'doc'); do >+ rm -rf $subdir >+ done >+ # The above is NOT enough, though! >+ # We must eradicate any mention of 'doc/Makefile' >+ # in all configure* scripts! That includes configure.ac >+ # AND configure scripts - take no prisoners! >+ find ${WORKDIR}/ -name 'configure.ac' | xargs sed -i.bak -e '/AC_CONFIG_FILES/s/doc\/Makefile//' >+ find ${WORKDIR}/ -name 'configure' | xargs sed -i.bak -e '/ac_config_files/s/doc\/Makefile//' >+ find ${WORKDIR}/ -name 'Makefile*' | xargs sed -i.bak -e 's/all *diststuff: *info/diststuff: info/' >+ find ${WORKDIR}/ -name 'Makefile*' | xargs sed -i.bak -e 's/SUBDIRS *= *doc *po/SUBDIRS = po/' >+ fi > } > > # In case the ebuild wants to add a few of their own. >@@ -282,6 +306,8 @@ > # on everyone in alpha (for now), we'll just enable it when possible > has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt ) > has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt ) >+ # Prevent makeinfo from running if doc is unset. >+ # ! use doc && myconf+=( --without-texinfo ) > > myconf+=( > --prefix="${EPREFIX}"/usr >@@ -322,10 +348,15 @@ > # For older versions, it means we don't get any info pages at all. > # Oh well, tough luck. #294617 > if [[ -e ${S}/gas/doc/as.info ]] || ! version_is_at_least 2.24 ; then >- sed -i \ >- -e '/^MAKEINFO/s:=.*:= true:' \ >- Makefile || die >+ sed -i -e '/^MAKEINFO/s:=.*:= true:' Makefile || die > fi >+ # Prevent 'make info' if doc is unset. >+ # if ! use doc ; then >+ # sed -i.bak -e '/maybe.*texinfo/s/^/# /; /^[# \t]*maybe-.*-texinfo *\\$/d' Makefile || die >+ # # for subdir in $(find . -mindepth 1 -maxdepth 1 -type d); do >+ # # sed -i.bak -e 's/ info-recursive / /g; s/ install-info-recursive / /g' $subdir/Makefile || die >+ # # done >+ # fi > } > > toolchain-binutils_src_compile() { >@@ -339,8 +370,11 @@ > > # only build info pages if we user wants them, and if > # we have makeinfo (may not exist when we bootstrap) >- if type -p makeinfo > /dev/null ; then >- emake info || die "make info failed" >+ # Prevent makeinfo from running if doc is unset. >+ if use doc ; then >+ if type -p makeinfo > /dev/null ; then >+ emake info || die "make info failed" >+ fi > fi > # we nuke the manpages when we're left with junk > # (like when we bootstrap, no perl -> no manpages)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 677458
: 564160