[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/

[Sam James]

commit:     e0bfeb250d886e096fd861a5d280e798c1e16e9c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 14:57:30 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 14:57:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0bfeb25

sys-libs/glibc: don't show upgrade_warning for cross-*

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

 sys-libs/glibc/glibc-2.37-r4.ebuild | 2 ++
 sys-libs/glibc/glibc-2.38-r1.ebuild | 2 ++
 sys-libs/glibc/glibc-9999.ebuild    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/sys-libs/glibc/glibc-2.37-r4.ebuild 
b/sys-libs/glibc/glibc-2.37-r4.ebuild
index 6a907b7f56e4..28494cebf365 100644
--- a/sys-libs/glibc/glibc-2.37-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.37-r4.ebuild
@@ -864,6 +864,8 @@ sanity_prechecks() {
 }
 
 upgrade_warning() {
+       is_crosscompile && return
+
        if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z 
${ROOT} ]]; then
                local oldv newv=$(ver_cut 1-2 ${PV})
                for oldv in ${REPLACING_VERSIONS}; do

diff --git a/sys-libs/glibc/glibc-2.38-r1.ebuild 
b/sys-libs/glibc/glibc-2.38-r1.ebuild
index ee566898a630..1182ef8ae5ac 100644
--- a/sys-libs/glibc/glibc-2.38-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.38-r1.ebuild
@@ -864,6 +864,8 @@ sanity_prechecks() {
 }
 
 upgrade_warning() {
+       is_crosscompile && return
+
        if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z 
${ROOT} ]]; then
                local oldv newv=$(ver_cut 1-2 ${PV})
                for oldv in ${REPLACING_VERSIONS}; do

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index c80a8e763200..6863e2427bf6 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -864,6 +864,8 @@ sanity_prechecks() {
 }
 
 upgrade_warning() {
+       is_crosscompile && return
+
        if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z 
${ROOT} ]]; then
                local oldv newv=$(ver_cut 1-2 ${PV})
                for oldv in ${REPLACING_VERSIONS}; do