[gentoo-commits] repo/gentoo:master commit in: llvm-core/flang/

[Michał Górny]

commit:     659a4c8adb0d70d26f04b1aa2bf0e386747d2a3b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 13:45:42 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 14:13:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659a4c8a

llvm-core/flang: Use llvm-runtimes/flang-rt

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 llvm-core/flang/flang-21.0.0.9999.ebuild                    | 13 ++++---------
 ...1.0.0.9999.ebuild => flang-21.0.0_pre20250221-r1.ebuild} | 13 ++++---------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/llvm-core/flang/flang-21.0.0.9999.ebuild 
b/llvm-core/flang/flang-21.0.0.9999.ebuild
index a5cd1ef77ae3..97f8cb4a73c0 100644
--- a/llvm-core/flang/flang-21.0.0.9999.ebuild
+++ b/llvm-core/flang/flang-21.0.0.9999.ebuild
@@ -20,6 +20,7 @@ DEPEND="
 "
 RDEPEND="
        ${DEPEND}
+       >=llvm-runtimes/flang-rt-${PV}:${LLVM_MAJOR}
 "
 BDEPEND="
        test? (
@@ -27,7 +28,7 @@ BDEPEND="
        )
 "
 
-LLVM_COMPONENTS=( flang flang-rt cmake )
+LLVM_COMPONENTS=( flang cmake )
 LLVM_TEST_COMPONENTS=( clang/test/Driver mlir/test/lib )
 llvm.org_set_globals
 
@@ -43,6 +44,8 @@ src_configure() {
                # flang does not feature a dylib, so do not install libraries
                # or headers
                -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON
+               # installed by llvm-runtimes/flang-rt
+               -DFLANG_INCLUDE_RUNTIME=OFF
 
                # TODO: always enable to obtain reproducible tools
                -DFLANG_INCLUDE_TESTS=$(usex test)
@@ -62,11 +65,3 @@ src_test() {
        local -x LIT_PRESERVES_TMP=1
        cmake_build check-flang
 }
-
-src_install() {
-       cmake_src_install
-
-       # move the runtime into 'lib' (sigh), until upstream resolves
-       # libdir support: https://github.com/llvm/llvm-project/issues/127538
-       mv "${ED}/usr/lib/llvm/${LLVM_MAJOR}"/{$(get_libdir),lib} || die
-}

diff --git a/llvm-core/flang/flang-21.0.0.9999.ebuild 
b/llvm-core/flang/flang-21.0.0_pre20250221-r1.ebuild
similarity index 83%
copy from llvm-core/flang/flang-21.0.0.9999.ebuild
copy to llvm-core/flang/flang-21.0.0_pre20250221-r1.ebuild
index a5cd1ef77ae3..97f8cb4a73c0 100644
--- a/llvm-core/flang/flang-21.0.0.9999.ebuild
+++ b/llvm-core/flang/flang-21.0.0_pre20250221-r1.ebuild
@@ -20,6 +20,7 @@ DEPEND="
 "
 RDEPEND="
        ${DEPEND}
+       >=llvm-runtimes/flang-rt-${PV}:${LLVM_MAJOR}
 "
 BDEPEND="
        test? (
@@ -27,7 +28,7 @@ BDEPEND="
        )
 "
 
-LLVM_COMPONENTS=( flang flang-rt cmake )
+LLVM_COMPONENTS=( flang cmake )
 LLVM_TEST_COMPONENTS=( clang/test/Driver mlir/test/lib )
 llvm.org_set_globals
 
@@ -43,6 +44,8 @@ src_configure() {
                # flang does not feature a dylib, so do not install libraries
                # or headers
                -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON
+               # installed by llvm-runtimes/flang-rt
+               -DFLANG_INCLUDE_RUNTIME=OFF
 
                # TODO: always enable to obtain reproducible tools
                -DFLANG_INCLUDE_TESTS=$(usex test)
@@ -62,11 +65,3 @@ src_test() {
        local -x LIT_PRESERVES_TMP=1
        cmake_build check-flang
 }
-
-src_install() {
-       cmake_src_install
-
-       # move the runtime into 'lib' (sigh), until upstream resolves
-       # libdir support: https://github.com/llvm/llvm-project/issues/127538
-       mv "${ED}/usr/lib/llvm/${LLVM_MAJOR}"/{$(get_libdir),lib} || die
-}