commit: afcd5aa47776265486ddaa6ca2adcd8480b32574 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Sun Mar 3 21:20:54 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 4 02:21:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afcd5aa4
sys-devel/llvm: use correct libtool on macos prefix Bug: https://bugs.gentoo.org/924839 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/35613 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-devel/llvm/llvm-17.0.6.ebuild | 8 +++++--- sys-devel/llvm/llvm-18.1.0_rc3.ebuild | 8 +++++--- sys-devel/llvm/llvm-18.1.0_rc4.ebuild | 8 +++++--- sys-devel/llvm/llvm-19.0.0.9999.ebuild | 8 +++++--- sys-devel/llvm/llvm-19.0.0_pre20240224.ebuild | 8 +++++--- sys-devel/llvm/llvm-19.0.0_pre20240302.ebuild | 8 +++++--- 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/sys-devel/llvm/llvm-17.0.6.ebuild b/sys-devel/llvm/llvm-17.0.6.ebuild index 8a87d9e2e08f..c5159086d72c 100644 --- a/sys-devel/llvm/llvm-17.0.6.ebuild +++ b/sys-devel/llvm/llvm-17.0.6.ebuild @@ -439,11 +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+=( + # 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 -DTerminfo_LIBRARIES=-lncurses + # Use our libtool instead of looking it up with xcrun + -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool" ) # LLVM can have very high memory consumption while linking, diff --git a/sys-devel/llvm/llvm-18.1.0_rc3.ebuild b/sys-devel/llvm/llvm-18.1.0_rc3.ebuild index 55ced7c14db1..5031f93dd455 100644 --- a/sys-devel/llvm/llvm-18.1.0_rc3.ebuild +++ b/sys-devel/llvm/llvm-18.1.0_rc3.ebuild @@ -444,11 +444,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+=( + # 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 -DTerminfo_LIBRARIES=-lncurses + # Use our libtool instead of looking it up with xcrun + -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool" ) # LLVM can have very high memory consumption while linking, diff --git a/sys-devel/llvm/llvm-18.1.0_rc4.ebuild b/sys-devel/llvm/llvm-18.1.0_rc4.ebuild index 55ced7c14db1..5031f93dd455 100644 --- a/sys-devel/llvm/llvm-18.1.0_rc4.ebuild +++ b/sys-devel/llvm/llvm-18.1.0_rc4.ebuild @@ -444,11 +444,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+=( + # 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 -DTerminfo_LIBRARIES=-lncurses + # Use our libtool instead of looking it up with xcrun + -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool" ) # LLVM can have very high memory consumption while linking, diff --git a/sys-devel/llvm/llvm-19.0.0.9999.ebuild b/sys-devel/llvm/llvm-19.0.0.9999.ebuild index 55ced7c14db1..5031f93dd455 100644 --- a/sys-devel/llvm/llvm-19.0.0.9999.ebuild +++ b/sys-devel/llvm/llvm-19.0.0.9999.ebuild @@ -444,11 +444,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+=( + # 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 -DTerminfo_LIBRARIES=-lncurses + # Use our libtool instead of looking it up with xcrun + -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool" ) # LLVM can have very high memory consumption while linking, diff --git a/sys-devel/llvm/llvm-19.0.0_pre20240224.ebuild b/sys-devel/llvm/llvm-19.0.0_pre20240224.ebuild index 55ced7c14db1..5031f93dd455 100644 --- a/sys-devel/llvm/llvm-19.0.0_pre20240224.ebuild +++ b/sys-devel/llvm/llvm-19.0.0_pre20240224.ebuild @@ -444,11 +444,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+=( + # 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 -DTerminfo_LIBRARIES=-lncurses + # Use our libtool instead of looking it up with xcrun + -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool" ) # LLVM can have very high memory consumption while linking, diff --git a/sys-devel/llvm/llvm-19.0.0_pre20240302.ebuild b/sys-devel/llvm/llvm-19.0.0_pre20240302.ebuild index 55ced7c14db1..5031f93dd455 100644 --- a/sys-devel/llvm/llvm-19.0.0_pre20240302.ebuild +++ b/sys-devel/llvm/llvm-19.0.0_pre20240302.ebuild @@ -444,11 +444,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+=( + # 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 -DTerminfo_LIBRARIES=-lncurses + # Use our libtool instead of looking it up with xcrun + -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool" ) # LLVM can have very high memory consumption while linking,
