| 1 |
commit: 543e8a28d137dfac2ee430311e326c7c68eefa56 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 30 06:22:00 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 30 06:29:20 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=543e8a28 |
| 7 |
|
| 8 |
sys-devel/binutils: sync output; more verbose logs |
| 9 |
|
| 10 |
See: 2619d10984d0633e8cab4464c389ba9cc10642cb |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-devel/binutils/binutils-2.38-r2.ebuild | 16 ++++++++++++---- |
| 14 |
sys-devel/binutils/binutils-9999.ebuild | 13 +++++++++---- |
| 15 |
2 files changed, 21 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/binutils/binutils-2.38-r2.ebuild b/sys-devel/binutils/binutils-2.38-r2.ebuild |
| 18 |
index 4a491aa88c86..dcf30dbb65a6 100644 |
| 19 |
--- a/sys-devel/binutils/binutils-2.38-r2.ebuild |
| 20 |
+++ b/sys-devel/binutils/binutils-2.38-r2.ebuild |
| 21 |
@@ -152,6 +152,11 @@ toolchain-binutils_pkgversion() { |
| 22 |
} |
| 23 |
|
| 24 |
src_configure() { |
| 25 |
+ # See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html |
| 26 |
+ # Avoid really confusing logs from subconfigure spam, makes logs far |
| 27 |
+ # more legible. |
| 28 |
+ MAKEOPTS="--output-sync=line ${MAKEOPTS}" |
| 29 |
+ |
| 30 |
# Setup some paths |
| 31 |
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} |
| 32 |
INCPATH=${LIBPATH}/include |
| 33 |
@@ -228,6 +233,9 @@ src_configure() { |
| 34 |
fi |
| 35 |
|
| 36 |
myconf+=( |
| 37 |
+ # (--disable-silent-rules should get passed automatically w/ econf which we use |
| 38 |
+ # in >= 2.39, so can drop it then.) |
| 39 |
+ --disable-silent-rules |
| 40 |
--prefix="${EPREFIX}"/usr |
| 41 |
--host=${CHOST} |
| 42 |
--target=${CTARGET} |
| 43 |
@@ -296,11 +304,11 @@ src_configure() { |
| 44 |
src_compile() { |
| 45 |
cd "${MY_BUILDDIR}" |
| 46 |
# see Note [tooldir hack for ldscripts] |
| 47 |
- emake tooldir="${EPREFIX}${TOOLPATH}" all |
| 48 |
+ emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all |
| 49 |
|
| 50 |
# only build info pages if the user wants them |
| 51 |
if use doc ; then |
| 52 |
- emake info |
| 53 |
+ emake V=1 info |
| 54 |
fi |
| 55 |
|
| 56 |
# we nuke the manpages when we're left with junk |
| 57 |
@@ -314,7 +322,7 @@ src_test() { |
| 58 |
# bug 637066 |
| 59 |
filter-flags -Wall -Wreturn-type |
| 60 |
|
| 61 |
- emake -k check |
| 62 |
+ emake -k V=1 check |
| 63 |
} |
| 64 |
|
| 65 |
src_install() { |
| 66 |
@@ -322,7 +330,7 @@ src_install() { |
| 67 |
|
| 68 |
cd "${MY_BUILDDIR}" |
| 69 |
# see Note [tooldir hack for ldscripts] |
| 70 |
- emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install |
| 71 |
+ emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install |
| 72 |
rm -rf "${ED}"/${LIBPATH}/bin |
| 73 |
use static-libs || find "${ED}" -name '*.la' -delete |
| 74 |
|
| 75 |
|
| 76 |
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild |
| 77 |
index 8a2d54bd59b9..ec3589ae100a 100644 |
| 78 |
--- a/sys-devel/binutils/binutils-9999.ebuild |
| 79 |
+++ b/sys-devel/binutils/binutils-9999.ebuild |
| 80 |
@@ -148,6 +148,11 @@ toolchain-binutils_pkgversion() { |
| 81 |
} |
| 82 |
|
| 83 |
src_configure() { |
| 84 |
+ # See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html |
| 85 |
+ # Avoid really confusing logs from subconfigure spam, makes logs far |
| 86 |
+ # more legible. |
| 87 |
+ MAKEOPTS="--output-sync=line ${MAKEOPTS}" |
| 88 |
+ |
| 89 |
# Setup some paths |
| 90 |
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} |
| 91 |
INCPATH=${LIBPATH}/include |
| 92 |
@@ -303,11 +308,11 @@ src_compile() { |
| 93 |
cd "${MY_BUILDDIR}" || die |
| 94 |
|
| 95 |
# see Note [tooldir hack for ldscripts] |
| 96 |
- emake tooldir="${EPREFIX}${TOOLPATH}" all |
| 97 |
+ emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all |
| 98 |
|
| 99 |
# only build info pages if the user wants them |
| 100 |
if use doc ; then |
| 101 |
- emake info |
| 102 |
+ emake V=1 info |
| 103 |
fi |
| 104 |
|
| 105 |
# we nuke the manpages when we're left with junk |
| 106 |
@@ -321,7 +326,7 @@ src_test() { |
| 107 |
# bug #637066 |
| 108 |
filter-flags -Wall -Wreturn-type |
| 109 |
|
| 110 |
- emake -k check |
| 111 |
+ emake -k V=1 check |
| 112 |
} |
| 113 |
|
| 114 |
src_install() { |
| 115 |
@@ -330,7 +335,7 @@ src_install() { |
| 116 |
cd "${MY_BUILDDIR}" || die |
| 117 |
|
| 118 |
# see Note [tooldir hack for ldscripts] |
| 119 |
- emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install |
| 120 |
+ emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install |
| 121 |
rm -rf "${ED}"/${LIBPATH}/bin || die |
| 122 |
use static-libs || find "${ED}" -name '*.la' -delete |
Archives