commit:     b7b3151057b6736a3d9477bec942379b0c6b460c
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 20:07:24 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 20:07:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b31510

sys-libs/glibc: Simplify environment output

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-libs/glibc/glibc-2.35-r10.ebuild | 16 ++++++++++------
 sys-libs/glibc/glibc-2.36-r3.ebuild  | 16 ++++++++++------
 sys-libs/glibc/glibc-9999.ebuild     | 16 ++++++++++------
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/sys-libs/glibc/glibc-2.35-r10.ebuild 
b/sys-libs/glibc/glibc-2.35-r10.ebuild
index 50faea777545..0395750a45d4 100644
--- a/sys-libs/glibc/glibc-2.35-r10.ebuild
+++ b/sys-libs/glibc/glibc-2.35-r10.ebuild
@@ -183,6 +183,15 @@ XFAIL_TEST_LIST=(
 # Small helper functions
 #
 
+dump_build_environment() {
+       einfo ==== glibc build environment 
========================================================
+       local v
+       for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD 
{AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP 
READELF; do
+               einfo " $(printf '%15s' ${v}:)   ${!v}"
+       done
+       einfo 
=====================================================================================
+}
+
 is_crosscompile() {
        [[ ${CHOST} != ${CTARGET} ]]
 }
@@ -913,13 +922,8 @@ src_prepare() {
 }
 
 glibc_do_configure() {
+       dump_build_environment
 
-       local v
-       for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD 
{AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP 
READELF; do
-               einfo " $(printf '%15s' ${v}:)   ${!v}"
-       done
-
-       echo
        local myconf=()
 
        # Use '=strong' instead of '=all' to protect only functions

diff --git a/sys-libs/glibc/glibc-2.36-r3.ebuild 
b/sys-libs/glibc/glibc-2.36-r3.ebuild
index d6ff07ee05da..4910c60fc2c5 100644
--- a/sys-libs/glibc/glibc-2.36-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.36-r3.ebuild
@@ -182,6 +182,15 @@ XFAIL_TEST_LIST=(
 # Small helper functions
 #
 
+dump_build_environment() {
+       einfo ==== glibc build environment 
========================================================
+       local v
+       for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD 
{AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP 
READELF; do
+               einfo " $(printf '%15s' ${v}:)   ${!v}"
+       done
+       einfo 
=====================================================================================
+}
+
 is_crosscompile() {
        [[ ${CHOST} != ${CTARGET} ]]
 }
@@ -914,13 +923,8 @@ src_prepare() {
 }
 
 glibc_do_configure() {
+       dump_build_environment
 
-       local v
-       for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD 
{AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP 
READELF; do
-               einfo " $(printf '%15s' ${v}:)   ${!v}"
-       done
-
-       echo
        local myconf=()
 
        # Use '=strong' instead of '=all' to protect only functions

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 6330ccf1997a..a2e792581064 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -183,6 +183,15 @@ XFAIL_TEST_LIST=(
 # Small helper functions
 #
 
+dump_build_environment() {
+       einfo ==== glibc build environment 
========================================================
+       local v
+       for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD 
{AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP 
READELF; do
+               einfo " $(printf '%15s' ${v}:)   ${!v}"
+       done
+       einfo 
=====================================================================================
+}
+
 is_crosscompile() {
        [[ ${CHOST} != ${CTARGET} ]]
 }
@@ -915,13 +924,8 @@ src_prepare() {
 }
 
 glibc_do_configure() {
+       dump_build_environment
 
-       local v
-       for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD 
{AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP 
READELF; do
-               einfo " $(printf '%15s' ${v}:)   ${!v}"
-       done
-
-       echo
        local myconf=()
 
        # Use '=strong' instead of '=all' to protect only functions

Reply via email to