From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B2FDA15800A for ; Thu, 24 Aug 2023 14:57:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F370A2BC01C; Thu, 24 Aug 2023 14:57:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DF5472BC01C for ; Thu, 24 Aug 2023 14:57:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09673340CCD for ; Thu, 24 Aug 2023 14:57:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 72DF91069 for ; Thu, 24 Aug 2023 14:57:43 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1692889052.e0bfeb250d886e096fd861a5d280e798c1e16e9c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/glibc/glibc-2.37-r4.ebuild sys-libs/glibc/glibc-2.38-r1.ebuild sys-libs/glibc/glibc-9999.ebuild X-VCS-Directories: sys-libs/glibc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e0bfeb250d886e096fd861a5d280e798c1e16e9c X-VCS-Branch: master Date: Thu, 24 Aug 2023 14:57:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: feae91ca-f198-4686-b9dd-3002f7161ea5 X-Archives-Hash: 9e3360c615cc416ff30e005eb74f9f6c commit: e0bfeb250d886e096fd861a5d280e798c1e16e9c Author: Sam James gentoo org> AuthorDate: Thu Aug 24 14:57:30 2023 +0000 Commit: Sam James gentoo 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 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