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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B267F1582EF for ; Mon, 24 Feb 2025 14:14:03 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 79A5B3431B1 for ; Mon, 24 Feb 2025 14:14:03 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 7A0AC1102F2; Mon, 24 Feb 2025 14:14:02 +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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 74FFB1102F2 for ; Mon, 24 Feb 2025 14:14:02 +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 2E4273431BD for ; Mon, 24 Feb 2025 14:14:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F5EF2741 for ; Mon, 24 Feb 2025 14:14:00 +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: <1740406437.659a4c8adb0d70d26f04b1aa2bf0e386747d2a3b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: llvm-core/flang/ X-VCS-Repository: repo/gentoo X-VCS-Files: llvm-core/flang/flang-21.0.0.9999.ebuild llvm-core/flang/flang-21.0.0_pre20250221-r1.ebuild X-VCS-Directories: llvm-core/flang/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 659a4c8adb0d70d26f04b1aa2bf0e386747d2a3b X-VCS-Branch: master Date: Mon, 24 Feb 2025 14:14:00 +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: 737521f8-2c34-40c1-b1d8-c58bc922a433 X-Archives-Hash: 955b40120faafe30d3f8dc254d958694 commit: 659a4c8adb0d70d26f04b1aa2bf0e386747d2a3b Author: Michał Górny gentoo org> AuthorDate: Mon Feb 24 13:45:42 2025 +0000 Commit: Michał Górny gentoo 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 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 -}