From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 1E6181582EF for ; Fri, 21 Feb 2025 16:46:24 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 096103430FC for ; Fri, 21 Feb 2025 16:46:24 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4CC3E110470; Fri, 21 Feb 2025 16:38:26 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 423D4110470 for ; Fri, 21 Feb 2025 16:38:26 +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 EE5D9345302 for ; Fri, 21 Feb 2025 16:38:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 557F616DF for ; Fri, 21 Feb 2025 16:38:24 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1740155797.512953539d79ad8c4b0b97375b6d29f5932c1d46.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild X-VCS-Directories: sys-libs/libxcrypt/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 512953539d79ad8c4b0b97375b6d29f5932c1d46 X-VCS-Branch: master Date: Fri, 21 Feb 2025 16:38:24 +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: 93e47b1e-8e68-4d18-903e-c1643821e5d1 X-Archives-Hash: adbfc596172d3c10d1e4073b790777eb commit: 512953539d79ad8c4b0b97375b6d29f5932c1d46 Author: Mike Gilbert gentoo org> AuthorDate: Thu Feb 20 03:57:09 2025 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Feb 21 16:36:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51295353 sys-libs/libxcrypt: restore hack to reset CC based on CTARGET Closes: https://bugs.gentoo.org/949976 Signed-off-by: Mike Gilbert gentoo.org> sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild | 16 +++++++++------- sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild | 14 ++++++++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild index 6bca15f08f61..31934e95cd77 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2004-2024 Gentoo Authors +# Copyright 2004-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -116,6 +116,14 @@ src_configure() { MYSYSROOT=${ESYSROOT} if target_is_not_host; then + # Hack to work around missing TARGET_CC support. + # See bug 949976. + if tc-is-clang; then + export CC="${CTARGET}-clang" + else + export CC="${CTARGET}-gcc" + fi + local CHOST=${CTARGET} MYPREFIX= @@ -126,12 +134,6 @@ src_configure() { multilib_env ABI=${DEFAULT_ABI} - tc-getCC >/dev/null - if [[ ${CC} != ${CHOST}-* ]]; then - unset CC - tc-getCC >/dev/null - fi - strip-unsupported-flags fi diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild index b4006c5176ff..566750ba0d8d 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild @@ -116,6 +116,14 @@ src_configure() { MYSYSROOT=${ESYSROOT} if target_is_not_host; then + # Hack to work around missing TARGET_CC support. + # See bug 949976. + if tc-is-clang; then + export CC="${CTARGET}-clang" + else + export CC="${CTARGET}-gcc" + fi + local CHOST=${CTARGET} MYPREFIX= @@ -126,12 +134,6 @@ src_configure() { multilib_env ABI=${DEFAULT_ABI} - tc-getCC >/dev/null - if [[ ${CC} != ${CHOST}-* ]]; then - unset CC - tc-getCC >/dev/null - fi - strip-unsupported-flags fi