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 0C8CF158089 for ; Wed, 27 Sep 2023 09:12:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A1CB2BC022; Wed, 27 Sep 2023 09:12:40 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1437C2BC022 for ; Wed, 27 Sep 2023 09:12:40 +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 4AE8F335CEC for ; Wed, 27 Sep 2023 09:12:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C26801271 for ; Wed, 27 Sep 2023 09:12:37 +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: <1695805952.8e62f993267124f495956bffb2dcdc00c9f8ece5.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/llvm/llvm-16.0.6.ebuild sys-devel/llvm/llvm-17.0.0_rc4.ebuild sys-devel/llvm/llvm-17.0.1.9999.ebuild sys-devel/llvm/llvm-17.0.1.ebuild sys-devel/llvm/llvm-18.0.0.9999.ebuild sys-devel/llvm/llvm-18.0.0_pre20230906.ebuild X-VCS-Directories: sys-devel/llvm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8e62f993267124f495956bffb2dcdc00c9f8ece5 X-VCS-Branch: master Date: Wed, 27 Sep 2023 09:12:37 +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: 26be76cb-1bd2-40fb-a0ce-c78c26327568 X-Archives-Hash: 016e53c7885ecd11e0bda38e7b5fae53 commit: 8e62f993267124f495956bffb2dcdc00c9f8ece5 Author: Alexey Sokolov asokolov org> AuthorDate: Sat Sep 23 09:00:52 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Sep 27 09:12:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e62f993 sys-devel/llvm: fix build in Darwin Prefix Bug: https://bugs.gentoo.org/758167 Signed-off-by: Alexey Sokolov asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/32730 Signed-off-by: Michał Górny gentoo.org> sys-devel/llvm/llvm-16.0.6.ebuild | 7 +++++++ sys-devel/llvm/llvm-17.0.0_rc4.ebuild | 7 +++++++ sys-devel/llvm/llvm-17.0.1.9999.ebuild | 7 +++++++ sys-devel/llvm/llvm-17.0.1.ebuild | 7 +++++++ sys-devel/llvm/llvm-18.0.0.9999.ebuild | 7 +++++++ sys-devel/llvm/llvm-18.0.0_pre20230906.ebuild | 7 +++++++ 6 files changed, 42 insertions(+) diff --git a/sys-devel/llvm/llvm-16.0.6.ebuild b/sys-devel/llvm/llvm-16.0.6.ebuild index ae2efdaf8280..d6cb84f6df61 100644 --- a/sys-devel/llvm/llvm-16.0.6.ebuild +++ b/sys-devel/llvm/llvm-16.0.6.ebuild @@ -425,6 +425,13 @@ multilib_src_configure() { ) fi + # On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and + # libncurses, but llvm tries to use libtinfo before libncurses, and ends up + # using libtinfo (actually, libncurses.dylib) from system instead of prefix + use kernel_Darwin && mycmakeargs+=( + -DTerminfo_LIBRARIES=-lncurses + ) + # workaround BMI bug in gcc-7 (fixed in 7.4) # https://bugs.gentoo.org/649880 # apply only to x86, https://bugs.gentoo.org/650506 diff --git a/sys-devel/llvm/llvm-17.0.0_rc4.ebuild b/sys-devel/llvm/llvm-17.0.0_rc4.ebuild index 3b29671ea107..6bda0f273990 100644 --- a/sys-devel/llvm/llvm-17.0.0_rc4.ebuild +++ b/sys-devel/llvm/llvm-17.0.0_rc4.ebuild @@ -439,6 +439,13 @@ multilib_src_configure() { ) fi + # On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and + # libncurses, but llvm tries to use libtinfo before libncurses, and ends up + # using libtinfo (actually, libncurses.dylib) from system instead of prefix + use kernel_Darwin && mycmakeargs+=( + -DTerminfo_LIBRARIES=-lncurses + ) + # workaround BMI bug in gcc-7 (fixed in 7.4) # https://bugs.gentoo.org/649880 # apply only to x86, https://bugs.gentoo.org/650506 diff --git a/sys-devel/llvm/llvm-17.0.1.9999.ebuild b/sys-devel/llvm/llvm-17.0.1.9999.ebuild index 3b29671ea107..6bda0f273990 100644 --- a/sys-devel/llvm/llvm-17.0.1.9999.ebuild +++ b/sys-devel/llvm/llvm-17.0.1.9999.ebuild @@ -439,6 +439,13 @@ multilib_src_configure() { ) fi + # On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and + # libncurses, but llvm tries to use libtinfo before libncurses, and ends up + # using libtinfo (actually, libncurses.dylib) from system instead of prefix + use kernel_Darwin && mycmakeargs+=( + -DTerminfo_LIBRARIES=-lncurses + ) + # workaround BMI bug in gcc-7 (fixed in 7.4) # https://bugs.gentoo.org/649880 # apply only to x86, https://bugs.gentoo.org/650506 diff --git a/sys-devel/llvm/llvm-17.0.1.ebuild b/sys-devel/llvm/llvm-17.0.1.ebuild index c6b0aa4bafb6..a7a24bb390c2 100644 --- a/sys-devel/llvm/llvm-17.0.1.ebuild +++ b/sys-devel/llvm/llvm-17.0.1.ebuild @@ -439,6 +439,13 @@ multilib_src_configure() { ) fi + # On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and + # libncurses, but llvm tries to use libtinfo before libncurses, and ends up + # using libtinfo (actually, libncurses.dylib) from system instead of prefix + use kernel_Darwin && mycmakeargs+=( + -DTerminfo_LIBRARIES=-lncurses + ) + # workaround BMI bug in gcc-7 (fixed in 7.4) # https://bugs.gentoo.org/649880 # apply only to x86, https://bugs.gentoo.org/650506 diff --git a/sys-devel/llvm/llvm-18.0.0.9999.ebuild b/sys-devel/llvm/llvm-18.0.0.9999.ebuild index 8f7c0ff09445..6e07e59a22ce 100644 --- a/sys-devel/llvm/llvm-18.0.0.9999.ebuild +++ b/sys-devel/llvm/llvm-18.0.0.9999.ebuild @@ -438,6 +438,13 @@ multilib_src_configure() { ) fi + # On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and + # libncurses, but llvm tries to use libtinfo before libncurses, and ends up + # using libtinfo (actually, libncurses.dylib) from system instead of prefix + use kernel_Darwin && mycmakeargs+=( + -DTerminfo_LIBRARIES=-lncurses + ) + # workaround BMI bug in gcc-7 (fixed in 7.4) # https://bugs.gentoo.org/649880 # apply only to x86, https://bugs.gentoo.org/650506 diff --git a/sys-devel/llvm/llvm-18.0.0_pre20230906.ebuild b/sys-devel/llvm/llvm-18.0.0_pre20230906.ebuild index 8f7c0ff09445..6e07e59a22ce 100644 --- a/sys-devel/llvm/llvm-18.0.0_pre20230906.ebuild +++ b/sys-devel/llvm/llvm-18.0.0_pre20230906.ebuild @@ -438,6 +438,13 @@ multilib_src_configure() { ) fi + # On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and + # libncurses, but llvm tries to use libtinfo before libncurses, and ends up + # using libtinfo (actually, libncurses.dylib) from system instead of prefix + use kernel_Darwin && mycmakeargs+=( + -DTerminfo_LIBRARIES=-lncurses + ) + # workaround BMI bug in gcc-7 (fixed in 7.4) # https://bugs.gentoo.org/649880 # apply only to x86, https://bugs.gentoo.org/650506