[gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils/

[Sam James]

commit:     543e8a28d137dfac2ee430311e326c7c68eefa56
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 06:22:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 30 06:29:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=543e8a28

sys-devel/binutils: sync output; more verbose logs

See: 2619d10984d0633e8cab4464c389ba9cc10642cb
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/binutils/binutils-2.38-r2.ebuild | 16 ++++++++++++----
 sys-devel/binutils/binutils-9999.ebuild    | 13 +++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/sys-devel/binutils/binutils-2.38-r2.ebuild 
b/sys-devel/binutils/binutils-2.38-r2.ebuild
index 4a491aa88c86..dcf30dbb65a6 100644
--- a/sys-devel/binutils/binutils-2.38-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.38-r2.ebuild
@@ -152,6 +152,11 @@ toolchain-binutils_pkgversion() {
 }
 
 src_configure() {
+       # See 
https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+       # Avoid really confusing logs from subconfigure spam, makes logs far
+       # more legible.
+       MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
        # Setup some paths
        LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
        INCPATH=${LIBPATH}/include
@@ -228,6 +233,9 @@ src_configure() {
        fi
 
        myconf+=(
+               # (--disable-silent-rules should get passed automatically w/ 
econf which we use
+               # in >= 2.39, so can drop it then.)
+               --disable-silent-rules
                --prefix="${EPREFIX}"/usr
                --host=${CHOST}
                --target=${CTARGET}
@@ -296,11 +304,11 @@ src_configure() {
 src_compile() {
        cd "${MY_BUILDDIR}"
        # see Note [tooldir hack for ldscripts]
-       emake tooldir="${EPREFIX}${TOOLPATH}" all
+       emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
 
        # only build info pages if the user wants them
        if use doc ; then
-               emake info
+               emake V=1 info
        fi
 
        # we nuke the manpages when we're left with junk
@@ -314,7 +322,7 @@ src_test() {
        # bug 637066
        filter-flags -Wall -Wreturn-type
 
-       emake -k check
+       emake -k V=1 check
 }
 
 src_install() {
@@ -322,7 +330,7 @@ src_install() {
 
        cd "${MY_BUILDDIR}"
        # see Note [tooldir hack for ldscripts]
-       emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+       emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
        rm -rf "${ED}"/${LIBPATH}/bin
        use static-libs || find "${ED}" -name '*.la' -delete
 

diff --git a/sys-devel/binutils/binutils-9999.ebuild 
b/sys-devel/binutils/binutils-9999.ebuild
index 8a2d54bd59b9..ec3589ae100a 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -148,6 +148,11 @@ toolchain-binutils_pkgversion() {
 }
 
 src_configure() {
+       # See 
https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+       # Avoid really confusing logs from subconfigure spam, makes logs far
+       # more legible.
+       MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
        # Setup some paths
        LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
        INCPATH=${LIBPATH}/include
@@ -303,11 +308,11 @@ src_compile() {
        cd "${MY_BUILDDIR}" || die
 
        # see Note [tooldir hack for ldscripts]
-       emake tooldir="${EPREFIX}${TOOLPATH}" all
+       emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
 
        # only build info pages if the user wants them
        if use doc ; then
-               emake info
+               emake V=1 info
        fi
 
        # we nuke the manpages when we're left with junk
@@ -321,7 +326,7 @@ src_test() {
        # bug #637066
        filter-flags -Wall -Wreturn-type
 
-       emake -k check
+       emake -k V=1 check
 }
 
 src_install() {
@@ -330,7 +335,7 @@ src_install() {
        cd "${MY_BUILDDIR}" || die
 
        # see Note [tooldir hack for ldscripts]
-       emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+       emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
        rm -rf "${ED}"/${LIBPATH}/bin || die
        use static-libs || find "${ED}" -name '*.la' -delete