From f6c8f1d42b1d45b61215ec0f8d6a3b9d7afe797f Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 29 Jul 2020 10:14:21 +0200 Subject: dev-ml/llvm-ocaml: Forward-port cmake.eclass to 11+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild | 10 +++++----- dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'dev-ml') diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild index f10bf23e527d..575154be6047 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild @@ -3,8 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit cmake-utils llvm llvm.org python-any-r1 +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake llvm llvm.org python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" @@ -82,7 +82,7 @@ src_configure() { # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 # also: custom rules for OCaml do not work for CPPFLAGS use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG" - cmake-utils_src_configure + cmake_src_configure local llvm_libdir=$(llvm-config --libdir) # an ugly hack; TODO: figure out a way to pass -L to ocaml... @@ -98,13 +98,13 @@ src_configure() { } src_compile() { - cmake-utils_src_compile ocaml_all + cmake_build ocaml_all } src_test() { # respect TMPDIR! local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make check-llvm-bindings-ocaml + cmake_build check-llvm-bindings-ocaml } src_install() { diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild index f10bf23e527d..575154be6047 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild @@ -3,8 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit cmake-utils llvm llvm.org python-any-r1 +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake llvm llvm.org python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" @@ -82,7 +82,7 @@ src_configure() { # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 # also: custom rules for OCaml do not work for CPPFLAGS use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG" - cmake-utils_src_configure + cmake_src_configure local llvm_libdir=$(llvm-config --libdir) # an ugly hack; TODO: figure out a way to pass -L to ocaml... @@ -98,13 +98,13 @@ src_configure() { } src_compile() { - cmake-utils_src_compile ocaml_all + cmake_build ocaml_all } src_test() { # respect TMPDIR! local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make check-llvm-bindings-ocaml + cmake_build check-llvm-bindings-ocaml } src_install() { -- cgit v1.2.3-65-gdbad