summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-lang/moarvm/moarvm-9999.ebuild36
1 files changed, 21 insertions, 15 deletions
diff --git a/dev-lang/moarvm/moarvm-9999.ebuild b/dev-lang/moarvm/moarvm-9999.ebuild
index f119a7ae28bc..575bf0228076 100644
--- a/dev-lang/moarvm/moarvm-9999.ebuild
+++ b/dev-lang/moarvm/moarvm-9999.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic
MY_PN="MoarVM"
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+ EGIT_SUBMODULES=( '*' '-3rdparty/libatomicops' '-3rdparty/libuv' )
inherit git-r3
KEYWORDS=""
S="${WORKDIR}/${P}"
@@ -21,15 +22,14 @@ DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
HOMEPAGE="http://moarvm.org"
LICENSE="Artistic-2"
SLOT="0"
-IUSE="asan clang debug doc +jit static-libs optimize ubsan"
+IUSE="asan clang debug doc static-libs optimize ubsan"
RDEPEND="dev-libs/libatomic_ops
- >=dev-libs/libtommath-1.0
- dev-libs/libuv
- jit? ( dev-lang/lua:0[deprecated]
- dev-lua/LuaBitOp )
+ >=dev-libs/libuv-1.26
+ dev-lang/lua:=
virtual/libffi"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
clang? ( >=sys-devel/clang-3.1 )
dev-lang/perl"
@@ -38,24 +38,30 @@ DOCS=( CREDITS README.markdown )
# Tests are conducted via nqp
RESTRICT=test
+src_prepare() {
+ if [[ "${PV}" == "9999" ]]; then
+ # Stupid upstream try to auto-fetch this themselves
+ git rm -f 3rdparty/{libatomicops,libuv} ||
+ die "Can't strip unused submodules"
+ fi
+ default
+}
+
src_configure() {
use doc && DOCS+=( docs/* )
local myconfigargs=(
- "--prefix=/usr"
- "--has-libtommath"
+ "--prefix" "/usr"
"--has-libuv"
"--has-libatomic_ops"
"--has-libffi"
- "--libdir=$(get_libdir)"
- "--compiler=$(usex clang clang gcc)"
+ "--libdir" "$(get_libdir)"
+ "--compiler" "$(usex clang clang gcc)"
"$(usex asan --asan)"
"$(usex debug --debug --no-debug)"
- "$(usex jit --lua=/usr/bin/lua --no-jit)"
"$(usex optimize --optimize= --no-optimize)"
"$(usex static-libs --static)"
"$(usex ubsan --ubsan)"
)
- use optimize && filter-flags '-O*'
- perl Configure.pl "${myconfigargs[@]}" || die
+ perl Configure.pl "${myconfigargs[@]}" moarshared || die
}