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 27BCE15808A for ; Wed, 06 Aug 2025 20:06:08 +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) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id BD14134209E for ; Wed, 06 Aug 2025 20:06:07 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id BD7871104A0; Wed, 06 Aug 2025 20:06:04 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id B3A651104A0 for ; Wed, 06 Aug 2025 20:06:04 +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 6A35E341FE6 for ; Wed, 06 Aug 2025 20:06:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1C7A29DC for ; Wed, 06 Aug 2025 20:06:02 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1754510757.85466dd307b691d09ef1abfeb5079b123353d844.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: llvm-runtimes/libcxxabi/ X-VCS-Repository: repo/gentoo X-VCS-Files: llvm-runtimes/libcxxabi/libcxxabi-19.1.7.ebuild llvm-runtimes/libcxxabi/libcxxabi-20.1.8.ebuild llvm-runtimes/libcxxabi/libcxxabi-21.1.0.9999.ebuild llvm-runtimes/libcxxabi/libcxxabi-22.0.0.9999.ebuild X-VCS-Directories: llvm-runtimes/libcxxabi/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 85466dd307b691d09ef1abfeb5079b123353d844 X-VCS-Branch: master Date: Wed, 06 Aug 2025 20:06:02 +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: 9069f2ad-1108-469d-b828-9ed6dc20ad8a X-Archives-Hash: f9427a636c7950ce9696ab0e5266dfe4 commit: 85466dd307b691d09ef1abfeb5079b123353d844 Author: Michal Rostecki protonmail com> AuthorDate: Wed Aug 6 19:16:53 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Aug 6 20:05:57 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85466dd3 llvm-runtimes/libcxxabi: Set CTARGET to CHOST if the package is not cross The multilib eclass doesn't set the CTARGET. Therefore, using CTARGET was breaking the multilib builds. At the same time, using CTARGET is necessary for crossdev to work. The long term solution should be fixing multilib eclass, but for now, make sure that CTARGET is correct inside the ebuild. Bug: https://bugs.gentoo.org/961153 Signed-off-by: Michal Rostecki protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43361 Signed-off-by: Michał Górny gentoo.org> llvm-runtimes/libcxxabi/libcxxabi-19.1.7.ebuild | 6 ++++++ llvm-runtimes/libcxxabi/libcxxabi-20.1.8.ebuild | 6 ++++++ llvm-runtimes/libcxxabi/libcxxabi-21.1.0.9999.ebuild | 6 ++++++ llvm-runtimes/libcxxabi/libcxxabi-22.0.0.9999.ebuild | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/llvm-runtimes/libcxxabi/libcxxabi-19.1.7.ebuild b/llvm-runtimes/libcxxabi/libcxxabi-19.1.7.ebuild index 6c3f4635d98d..fa88464e9676 100644 --- a/llvm-runtimes/libcxxabi/libcxxabi-19.1.7.ebuild +++ b/llvm-runtimes/libcxxabi/libcxxabi-19.1.7.ebuild @@ -47,6 +47,12 @@ python_check_deps() { } multilib_src_configure() { + # Workaround for bgo #961153. + # TODO: Fix the multilib.eclass, so it sets CTARGET properly. + if ! is_crosspkg; then + export CTARGET=${CHOST} + fi + if use clang; then llvm_prepend_path -b "${LLVM_MAJOR}" local -x CC=${CTARGET}-clang diff --git a/llvm-runtimes/libcxxabi/libcxxabi-20.1.8.ebuild b/llvm-runtimes/libcxxabi/libcxxabi-20.1.8.ebuild index 5668a32deb26..d78488d647d9 100644 --- a/llvm-runtimes/libcxxabi/libcxxabi-20.1.8.ebuild +++ b/llvm-runtimes/libcxxabi/libcxxabi-20.1.8.ebuild @@ -47,6 +47,12 @@ python_check_deps() { } multilib_src_configure() { + # Workaround for bgo #961153. + # TODO: Fix the multilib.eclass, so it sets CTARGET properly. + if ! is_crosspkg; then + export CTARGET=${CHOST} + fi + if use clang; then llvm_prepend_path -b "${LLVM_MAJOR}" local -x CC=${CTARGET}-clang diff --git a/llvm-runtimes/libcxxabi/libcxxabi-21.1.0.9999.ebuild b/llvm-runtimes/libcxxabi/libcxxabi-21.1.0.9999.ebuild index f929e4caf008..d1a2b5b4668a 100644 --- a/llvm-runtimes/libcxxabi/libcxxabi-21.1.0.9999.ebuild +++ b/llvm-runtimes/libcxxabi/libcxxabi-21.1.0.9999.ebuild @@ -48,6 +48,12 @@ python_check_deps() { } multilib_src_configure() { + # Workaround for bgo #961153. + # TODO: Fix the multilib.eclass, so it sets CTARGET properly. + if ! is_crosspkg; then + export CTARGET=${CHOST} + fi + if use clang; then llvm_prepend_path -b "${LLVM_MAJOR}" local -x CC=${CTARGET}-clang diff --git a/llvm-runtimes/libcxxabi/libcxxabi-22.0.0.9999.ebuild b/llvm-runtimes/libcxxabi/libcxxabi-22.0.0.9999.ebuild index f929e4caf008..d1a2b5b4668a 100644 --- a/llvm-runtimes/libcxxabi/libcxxabi-22.0.0.9999.ebuild +++ b/llvm-runtimes/libcxxabi/libcxxabi-22.0.0.9999.ebuild @@ -48,6 +48,12 @@ python_check_deps() { } multilib_src_configure() { + # Workaround for bgo #961153. + # TODO: Fix the multilib.eclass, so it sets CTARGET properly. + if ! is_crosspkg; then + export CTARGET=${CHOST} + fi + if use clang; then llvm_prepend_path -b "${LLVM_MAJOR}" local -x CC=${CTARGET}-clang