diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-04-05 14:13:13 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-05-09 22:51:00 +0200 |
| commit | 71a7e85770ecab393a9cc4190816e2bc7e28e033 (patch) | |
| tree | 4597e47906c5fc4fd975e94e53e6876ef6fb77ad /dev-lang | |
| parent | dev-lang/swi-prolog: Drop 8.2.2 and 8.3.20 (diff) | |
| download | gentoo-71a7e85770ecab393a9cc4190816e2bc7e28e033.tar.gz gentoo-71a7e85770ecab393a9cc4190816e2bc7e28e033.tar.bz2 gentoo-71a7e85770ecab393a9cc4190816e2bc7e28e033.zip | |
dev-lang/mozart: Tidyup, use cmake.eclass
- local mycmakeargs
- Drop superfluous and post-inherit BUILD_DIR, CMAKE_USE_DIR
- Drop superfluous eapply_user, done by cmake_src_prepare
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/mozart/mozart-2.0.1.ebuild | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild b/dev-lang/mozart/mozart-2.0.1.ebuild index 09d87b133828..d469901f25b6 100644 --- a/dev-lang/mozart/mozart-2.0.1.ebuild +++ b/dev-lang/mozart/mozart-2.0.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils java-pkg-2 java-ant-2 +inherit cmake java-pkg-2 java-ant-2 PATCHSET_VER="1" @@ -31,50 +31,46 @@ DEPEND="${RDEPEND} test? ( dev-cpp/gtest:= )" S="${WORKDIR}/${PN}2-${PV}" -BUILD_DIR="${S}/build" -CMAKE_USE_DIR="${S}" src_prepare() { if [[ -d "${WORKDIR}"/${PV} ]] ; then eapply "${WORKDIR}"/${PV} fi - eapply_user - touch "${S}"/stdlib/CMakeLists.txt - touch "${S}"/vm/vm/test/gtest/CMakeLists.txt + touch stdlib/CMakeLists.txt || die + touch vm/vm/test/gtest/CMakeLists.txt || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { - mycmakeargs=( + local mycmakeargs=( -DMOZART_BOOST_USE_STATIC_LIBS=OFF - -DEMACS=$(if use emacs; then echo /usr/bin/emacs; fi) - ) + -DEMACS=$(usex emacs "/usr/bin/emacs" "") + ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { EANT_GENTOO_CLASSPATH="scala:2.12" - cd "${S}"/bootcompiler + pushd bootcompiler > /dev/null || die ANT_OPTS="-Xss2M" eant jar + popd > /dev/null || die - cd "${S}" - cmake-utils_src_compile + cmake_src_compile } src_test() { - cmake-utils_src_compile vmtest platform-test - cmake-utils_src_test -V + cmake_build vmtest platform-test + cmake_src_test -V } src_install() { - cmake-utils_src_install + cmake_src_install - cd "${BUILD_DIR}" - dolib.so vm/vm/main/libmozartvm.so - dolib.so vm/boostenv/main/libmozartvmboost.so + dolib.so "${BUILD_DIR}"/vm/vm/main/libmozartvm.so + dolib.so "${BUILD_DIR}"/vm/boostenv/main/libmozartvmboost.so } pkg_postinst() { |