commit: 7a8588f407a586b1d13eca1ffa0eec3b7d0f0139 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jun 20 21:08:32 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Jun 23 18:30:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8588f4
dev-ml/llvm-ocaml: Dedupe with new eclass code Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild | 17 ++--------------- dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild | 17 ++--------------- dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild | 17 ++--------------- 3 files changed, 6 insertions(+), 45 deletions(-) diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild index c87d9f13cf3..c7b4967353f 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -inherit cmake-utils llvm llvm.org multiprocessing python-any-r1 +inherit cmake-utils llvm llvm.org python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" @@ -38,24 +38,11 @@ BDEPEND=" test? ( dev-ml/ounit ) ${PYTHON_DEPS}" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - pkg_setup() { LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup python-any-r1_pkg_setup } -src_prepare() { - # Python is needed to run tests using lit - python_setup - - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake-utils_src_prepare -} - src_configure() { local libdir=$(get_libdir) local mycmakeargs=( @@ -89,7 +76,7 @@ src_configure() { ) use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" ) # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild index ff77167a766..7cff2bc4284 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake llvm llvm.org multiprocessing python-any-r1 +inherit cmake llvm llvm.org python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" @@ -38,24 +38,11 @@ BDEPEND=" test? ( dev-ml/ounit ) ${PYTHON_DEPS}" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - pkg_setup() { LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup python-any-r1_pkg_setup } -src_prepare() { - # Python is needed to run tests using lit - python_setup - - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - src_configure() { local libdir=$(get_libdir) local mycmakeargs=( @@ -89,7 +76,7 @@ src_configure() { ) use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" ) # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 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 5a10d4d1de5..f10bf23e527 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 @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -inherit cmake-utils llvm llvm.org multiprocessing python-any-r1 +inherit cmake-utils llvm llvm.org python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" @@ -38,24 +38,11 @@ BDEPEND=" test? ( dev-ml/ounit ) ${PYTHON_DEPS}" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - pkg_setup() { LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup python-any-r1_pkg_setup } -src_prepare() { - # Python is needed to run tests using lit - python_setup - - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake-utils_src_prepare -} - src_configure() { local libdir=$(get_libdir) local mycmakeargs=( @@ -89,7 +76,7 @@ src_configure() { ) use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" ) # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844