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 96C3E1581E7 for ; Tue, 23 Apr 2024 14:40:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6E95E2A06; Tue, 23 Apr 2024 14:40:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 88C00E2A06 for ; Tue, 23 Apr 2024 14:40:28 +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 851A43431D2 for ; Tue, 23 Apr 2024 14:40:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBDB61332 for ; Tue, 23 Apr 2024 14:40:25 +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: <1713883201.4439bf758dc2bfc1584f646c055ee54a1a6c2b43.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.38-r12.ebuild sys-libs/glibc/glibc-2.39-r3.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: 4439bf758dc2bfc1584f646c055ee54a1a6c2b43 X-VCS-Branch: master Date: Tue, 23 Apr 2024 14:40:25 +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: 0348f58c-b7fc-43f7-bcf4-75ef940130f1 X-Archives-Hash: d378a9b4bd6e3e9a6e2489e40885e768 commit: 4439bf758dc2bfc1584f646c055ee54a1a6c2b43 Author: Sam James gentoo org> AuthorDate: Tue Apr 23 14:38:53 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 23 14:40:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4439bf75 sys-libs/glibc: fix CPP definition On sparc, this might break if e.g. -mcpu is in CFLAGS. It's similar to the arm case already mentioned. Reported by Dakon: "ok, it greps for __sparc_v8 or __sparc_v9 cpp output, but it does not pass the -mcpu I have in CFLAGS, so it falls back to the compiler default which still is v7" Fixes: 30e32d9ed408fd786e9c1e16063c1228d123ebc1 Fixes: 39ba3e621469464a59dc7a37e3c41366d7856066 Signed-off-by: Sam James gentoo.org> sys-libs/glibc/glibc-2.38-r12.ebuild | 2 +- sys-libs/glibc/glibc-2.39-r3.ebuild | 2 +- sys-libs/glibc/glibc-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-libs/glibc/glibc-2.38-r12.ebuild b/sys-libs/glibc/glibc-2.38-r12.ebuild index aef3c5d5d479..88280475bb10 100644 --- a/sys-libs/glibc/glibc-2.38-r12.ebuild +++ b/sys-libs/glibc/glibc-2.38-r12.ebuild @@ -663,7 +663,7 @@ setup_env() { # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" - export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS}" + export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS} ${CFLAGS}" if is_crosscompile; then # Assume worst-case bootstrap: glibc is built for the first time diff --git a/sys-libs/glibc/glibc-2.39-r3.ebuild b/sys-libs/glibc/glibc-2.39-r3.ebuild index f53dac7811b7..1e6aadbb04e3 100644 --- a/sys-libs/glibc/glibc-2.39-r3.ebuild +++ b/sys-libs/glibc/glibc-2.39-r3.ebuild @@ -676,7 +676,7 @@ setup_env() { # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" - export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS}" + export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS} ${CFLAGS}" if is_crosscompile; then # Assume worst-case bootstrap: glibc is built for the first time diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index c6fc206e2d4f..c3dce15e7e99 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -676,7 +676,7 @@ setup_env() { # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" - export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS}" + export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS} ${CFLAGS}" if is_crosscompile; then # Assume worst-case bootstrap: glibc is built for the first time