commit: e5d9245dbc919fe129b1bf68ebd315408f2cf796
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 10:52:58 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 11:13:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d9245d
dev-ml/llvm-ocaml: Migrate to llvm-utils
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-ml/llvm-ocaml/llvm-ocaml-18.1.0_rc2.ebuild | 9 +++------
dev-ml/llvm-ocaml/llvm-ocaml-19.0.0.9999.ebuild | 9 +++------
dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240203.ebuild | 9 +++------
3 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-18.1.0_rc2.ebuild
b/dev-ml/llvm-ocaml/llvm-ocaml-18.1.0_rc2.ebuild
index 8c4bee7af2e9..879c30db0807 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-18.1.0_rc2.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-18.1.0_rc2.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake llvm.org llvm-utils python-any-r1
DESCRIPTION="OCaml bindings for LLVM"
HOMEPAGE="https://llvm.org/"
@@ -34,12 +34,9 @@ LLVM_COMPONENTS=( llvm cmake third-party )
LLVM_USE_TARGETS=llvm
llvm.org_set_globals
-pkg_setup() {
- LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
src_configure() {
+ llvm_prepend_path "${LLVM_MAJOR}"
+
local libdir=$(get_libdir)
local mycmakeargs=(
-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0.9999.ebuild
b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0.9999.ebuild
index 8c4bee7af2e9..879c30db0807 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake llvm.org llvm-utils python-any-r1
DESCRIPTION="OCaml bindings for LLVM"
HOMEPAGE="https://llvm.org/"
@@ -34,12 +34,9 @@ LLVM_COMPONENTS=( llvm cmake third-party )
LLVM_USE_TARGETS=llvm
llvm.org_set_globals
-pkg_setup() {
- LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
src_configure() {
+ llvm_prepend_path "${LLVM_MAJOR}"
+
local libdir=$(get_libdir)
local mycmakeargs=(
-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240203.ebuild
b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240203.ebuild
index 8c4bee7af2e9..879c30db0807 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240203.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240203.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake llvm.org llvm-utils python-any-r1
DESCRIPTION="OCaml bindings for LLVM"
HOMEPAGE="https://llvm.org/"
@@ -34,12 +34,9 @@ LLVM_COMPONENTS=( llvm cmake third-party )
LLVM_USE_TARGETS=llvm
llvm.org_set_globals
-pkg_setup() {
- LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
src_configure() {
+ llvm_prepend_path "${LLVM_MAJOR}"
+
local libdir=$(get_libdir)
local mycmakeargs=(
-DLLVM_LIBDIR_SUFFIX=${libdir#lib}