commit: 7a505aed3d730685006abdeb6c0ca4f1698bfb76 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Fri Mar 30 11:17:25 2018 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Fri Mar 30 11:43:08 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a505aed
sys-libs/glibc: log when ebuild overrides CC/CFLAGS Package-Manager: Portage-2.3.26, Repoman-2.3.7 sys-libs/glibc/glibc-2.26-r6.ebuild | 17 +++++++++++++---- sys-libs/glibc/glibc-2.27-r1.ebuild | 19 +++++++++++++++---- sys-libs/glibc/glibc-9999.ebuild | 19 +++++++++++++++---- 3 files changed, 43 insertions(+), 12 deletions(-) diff --git a/sys-libs/glibc/glibc-2.26-r6.ebuild b/sys-libs/glibc/glibc-2.26-r6.ebuild index 2729cf8d6eb..0922ffb404f 100644 --- 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 aa1b179ab4b..a175b225e18 100644 --- 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 a978eaf1970..52fe095e5fd 100644 --- 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" }