sys-libs/glibc: log when ebuild overrides CC/CFLAGS

Package-Manager: Portage-2.3.26, Repoman-2.3.7

diff --git a/sys-libs/glibc/glibc-2.26-r6.ebuild b/sys-libs/glibc/glibc-2.26-r6.ebuild
index 2729cf8d6ebe0af8588e03ca9740305192c38b9c..0922ffb404fd007e5edadc492a4b8336e18128b8 100644 (file)
--- a/sys-libs/glibc/glibc-2.26-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r6.ebuild
@@ -532,11 +532,20 @@ glibc_headers_configure() {
 
        # Nothing is compiled here which would affect the headers for the target.
        # So forcing CC/CFLAGS is sane.
+       local headers_only_CC=$(tc-getBUILD_CC)
+       local headers_only_CFLAGS="-O1 -pipe"
+       local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE"
+       local headers_only_LDFLAGS=""
        set -- "${S}"/configure "${myconf[@]}"
-       echo "$@"
-       CC="$(tc-getBUILD_CC)" \
-       CFLAGS="-O1 -pipe" \
-       CPPFLAGS="-U_FORTIFY_SOURCE" \
+       echo \
+               "CC=${headers_only_CC}" \
+               "CFLAGS=${headers_only_CFLAGS}" \
+               "CPPFLAGS=${headers_only_CPPFLAGS}" \
+               "LDFLAGS=${headers_only_LDFLAGS}" \
+               "$@"
+       CC=${headers_only_CC} \
+       CFLAGS=${headers_only_CFLAGS} \
+       CPPFLAGS=${headers_only_CPPFLAGS} \
        LDFLAGS="" \
        "$@" || die "failed to configure glibc"
 }

diff --git a/sys-libs/glibc/glibc-2.27-r1.ebuild b/sys-libs/glibc/glibc-2.27-r1.ebuild
index aa1b179ab4b10ef9c0e1429d807b8308bb0cc748..a175b225e1816e894c6b04326ba9badae5c9f35e 100644 (file)
--- a/sys-libs/glibc/glibc-2.27-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r1.ebuild
@@ -450,6 +450,7 @@ setup_env() {
                # and fall back on CFLAGS.
                local VAR=CFLAGS_${CTARGET//[-.]/_}
                CFLAGS=${!VAR-${CFLAGS}}
+               einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
        fi
 
        setup_flags
@@ -463,6 +464,7 @@ setup_env() {
        # top of each other.
        : ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})}
        export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+       einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
 }
 
 foreach_abi() {
@@ -1022,11 +1024,20 @@ glibc_headers_configure() {
 
        # Nothing is compiled here which would affect the headers for the target.
        # So forcing CC/CFLAGS is sane.
+       local headers_only_CC=$(tc-getBUILD_CC)
+       local headers_only_CFLAGS="-O1 -pipe"
+       local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE"
+       local headers_only_LDFLAGS=""
        set -- "${S}"/configure "${myconf[@]}"
-       echo "$@"
-       CC="$(tc-getBUILD_CC)" \
-       CFLAGS="-O1 -pipe" \
-       CPPFLAGS="-U_FORTIFY_SOURCE" \
+       echo \
+               "CC=${headers_only_CC}" \
+               "CFLAGS=${headers_only_CFLAGS}" \
+               "CPPFLAGS=${headers_only_CPPFLAGS}" \
+               "LDFLAGS=${headers_only_LDFLAGS}" \
+               "$@"
+       CC=${headers_only_CC} \
+       CFLAGS=${headers_only_CFLAGS} \
+       CPPFLAGS=${headers_only_CPPFLAGS} \
        LDFLAGS="" \
        "$@" || die "failed to configure glibc"
 }

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index a978eaf1970b1e850c50d683949d7af59dfcf74f..52fe095e5fdce84a2de37482c8f220c3ce1c2777 100644 (file)
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -450,6 +450,7 @@ setup_env() {
                # and fall back on CFLAGS.
                local VAR=CFLAGS_${CTARGET//[-.]/_}
                CFLAGS=${!VAR-${CFLAGS}}
+               einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
        fi
 
        setup_flags
@@ -463,6 +464,7 @@ setup_env() {
        # top of each other.
        : ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})}
        export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+       einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
 }
 
 foreach_abi() {
@@ -1022,11 +1024,20 @@ glibc_headers_configure() {
 
        # Nothing is compiled here which would affect the headers for the target.
        # So forcing CC/CFLAGS is sane.
+       local headers_only_CC=$(tc-getBUILD_CC)
+       local headers_only_CFLAGS="-O1 -pipe"
+       local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE"
+       local headers_only_LDFLAGS=""
        set -- "${S}"/configure "${myconf[@]}"
-       echo "$@"
-       CC="$(tc-getBUILD_CC)" \
-       CFLAGS="-O1 -pipe" \
-       CPPFLAGS="-U_FORTIFY_SOURCE" \
+       echo \
+               "CC=${headers_only_CC}" \
+               "CFLAGS=${headers_only_CFLAGS}" \
+               "CPPFLAGS=${headers_only_CPPFLAGS}" \
+               "LDFLAGS=${headers_only_LDFLAGS}" \
+               "$@"
+       CC=${headers_only_CC} \
+       CFLAGS=${headers_only_CFLAGS} \
+       CPPFLAGS=${headers_only_CPPFLAGS} \
        LDFLAGS="" \
        "$@" || die "failed to configure glibc"
 }