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 33361158094 for ; Fri, 23 Sep 2022 20:00:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 491C0E0D5C; Fri, 23 Sep 2022 20:00:38 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 3093DE0D5C for ; Fri, 23 Sep 2022 20:00:38 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32C94340F99 for ; Fri, 23 Sep 2022 20:00:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D28E75 for ; Fri, 23 Sep 2022 20:00:35 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1663963224.ac0221cf76daa68f3acff74185e7afde7adfe9a6.dilfridge@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.36-r3.ebuild sys-libs/glibc/glibc-9999.ebuild X-VCS-Directories: sys-libs/glibc/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: ac0221cf76daa68f3acff74185e7afde7adfe9a6 X-VCS-Branch: master Date: Fri, 23 Sep 2022 20:00:35 +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: 77d13724-d3c5-4396-bfb9-6997839181aa X-Archives-Hash: 469617beec225554380f250705189803 commit: ac0221cf76daa68f3acff74185e7afde7adfe9a6 Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Sep 23 20:00:00 2022 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Sep 23 20:00:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac0221cf sys-libs/glibc: Fix variable names Signed-off-by: Andreas K. Hüttel gentoo.org> sys-libs/glibc/glibc-2.36-r3.ebuild | 20 ++++++++++---------- sys-libs/glibc/glibc-9999.ebuild | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sys-libs/glibc/glibc-2.36-r3.ebuild b/sys-libs/glibc/glibc-2.36-r3.ebuild index f9e61a195f5b..d6ff07ee05da 100644 --- a/sys-libs/glibc/glibc-2.36-r3.ebuild +++ b/sys-libs/glibc/glibc-2.36-r3.ebuild @@ -522,12 +522,12 @@ setup_env() { fi # Reset CC and CXX to the value at start of emerge - export CC=${__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}} - export CXX=${__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}} + export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}} + export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}} - # and make sure __ORIC_CC and __ORIG_CXX is defined now. - export __ORIG_CC=${CC} - export __ORIG_CXX=${CXX} + # and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now. + export glibc__ORIG_CC=${CC} + export glibc__ORIG_CXX=${CXX} if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then @@ -585,10 +585,10 @@ setup_env() { # around the original clean value to avoid appending multiple ABIs on # top of each other. (Why does the comment talk about CFLAGS if the code # acts on CC?) - export __GLIBC_CC=${CC} - export __GLIBC_CXX=${CXX} + export glibc__GLIBC_CC=${CC} + export glibc__GLIBC_CXX=${CXX} - export __abi_CFLAGS="$(get_abi_CFLAGS)" + export glibc__abi_CFLAGS="$(get_abi_CFLAGS)" # CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760 # To build .S (assembly) files with the same ABI-specific flags @@ -597,10 +597,10 @@ setup_env() { # Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS # and breaks multiarch support. See 659030#c3 for an example. # The glibc configure script doesn't properly use LDFLAGS all the time. - export CC="${__GLIBC_CC} ${__abi_CFLAGS} ${CFLAGS} ${LDFLAGS}" + export CC="${glibc__GLIBC_CC} ${glibc__abi_CFLAGS} ${CFLAGS} ${LDFLAGS}" # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 - export CXX="${__GLIBC_CXX} ${__abi_CFLAGS} ${CFLAGS}" + export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" if is_crosscompile; then # Assume worst-case bootstrap: glibc is buil first time diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 7274cb4d125d..6330ccf1997a 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -523,12 +523,12 @@ setup_env() { fi # Reset CC and CXX to the value at start of emerge - export CC=${__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}} - export CXX=${__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}} + export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}} + export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}} - # and make sure __ORIC_CC and __ORIG_CXX is defined now. - export __ORIG_CC=${CC} - export __ORIG_CXX=${CXX} + # and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now. + export glibc__ORIG_CC=${CC} + export glibc__ORIG_CXX=${CXX} if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then @@ -586,10 +586,10 @@ setup_env() { # around the original clean value to avoid appending multiple ABIs on # top of each other. (Why does the comment talk about CFLAGS if the code # acts on CC?) - export __GLIBC_CC=${CC} - export __GLIBC_CXX=${CXX} + export glibc__GLIBC_CC=${CC} + export glibc__GLIBC_CXX=${CXX} - export __abi_CFLAGS="$(get_abi_CFLAGS)" + export glibc__abi_CFLAGS="$(get_abi_CFLAGS)" # CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760 # To build .S (assembly) files with the same ABI-specific flags @@ -598,10 +598,10 @@ setup_env() { # Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS # and breaks multiarch support. See 659030#c3 for an example. # The glibc configure script doesn't properly use LDFLAGS all the time. - export CC="${__GLIBC_CC} ${__abi_CFLAGS} ${CFLAGS} ${LDFLAGS}" + export CC="${glibc__GLIBC_CC} ${glibc__abi_CFLAGS} ${CFLAGS} ${LDFLAGS}" # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 - export CXX="${__GLIBC_CXX} ${__abi_CFLAGS} ${CFLAGS}" + export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" if is_crosscompile; then # Assume worst-case bootstrap: glibc is buil first time