[gentoo-commits] repo/gentoo:master commit in: llvm-runtimes/offload/

[Michał Górny]

commit:     026b336f6fd7321fe6d61d505175bbb906a0665e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 10 08:48:18 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 10 08:48:40 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=026b336f

llvm-runtimes/offload: Revert "Switch to runtimes build"

My bad.  Tests work only if llvm-runtimes/offload is installed first.

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

 llvm-runtimes/offload/offload-22.0.0.9999.ebuild | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/llvm-runtimes/offload/offload-22.0.0.9999.ebuild 
b/llvm-runtimes/offload/offload-22.0.0.9999.ebuild
index 6d87304be648..977284643669 100644
--- a/llvm-runtimes/offload/offload-22.0.0.9999.ebuild
+++ b/llvm-runtimes/offload/offload-22.0.0.9999.ebuild
@@ -46,7 +46,7 @@ BDEPEND="
        )
 "
 
-LLVM_COMPONENTS=( runtimes offload cmake libc llvm/{cmake,utils/llvm-lit} )
+LLVM_COMPONENTS=( offload cmake runtimes/cmake libc )
 LLVM_TEST_COMPONENTS=( openmp/cmake )
 llvm.org_set_globals
 
@@ -98,17 +98,20 @@ src_configure() {
        fi
 
        local mycmakeargs=(
-               -DLLVM_ENABLE_RUNTIMES=offload
-               -DOPENMP_STANDALONE_BUILD=ON
-               -DOFFLOAD_LIBDIR_SUFFIX="${libdir#lib}"
                -DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
 
+               -DOFFLOAD_LIBDIR_SUFFIX="${libdir#lib}"
                -DOFFLOAD_INCLUDE_TESTS=$(usex test)
                -DLIBOMPTARGET_PLUGINS_TO_BUILD="${plugins}"
                -DLIBOMPTARGET_OMPT_SUPPORT="$(usex ompt)"
 
                # this breaks building static target libs
                -DBUILD_SHARED_LIBS=OFF
+
+               -DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+               -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+               # force using shared libffi
+               -DFFI_STATIC_LIBRARIES=NO
        )
 
        [[ ! ${LLVM_ALLOW_GPU_TESTING} ]] && mycmakeargs+=(