From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 023E2138334 for ; Sun, 4 Aug 2019 20:07:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12FF3E08ED; Sun, 4 Aug 2019 20:07:46 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DD1C5E08ED for ; Sun, 4 Aug 2019 20:07:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22D54349A06 for ; Sun, 4 Aug 2019 20:07:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FCC373C for ; Sun, 4 Aug 2019 20:07:42 +0000 (UTC) From: "Kent Fredric" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kent Fredric" Message-ID: <1564949185.116e9c7e2b0c83556761f1e6187be3fdd4c60cb3.kentnl@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/moarvm/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/moarvm/moarvm-9999.ebuild X-VCS-Directories: dev-lang/moarvm/ X-VCS-Committer: kentnl X-VCS-Committer-Name: Kent Fredric X-VCS-Revision: 116e9c7e2b0c83556761f1e6187be3fdd4c60cb3 X-VCS-Branch: master Date: Sun, 4 Aug 2019 20:07:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f248c77b-8347-4137-a48a-ff416efb75c5 X-Archives-Hash: ea4e90cdd86640a3d2cf1e61bff9f3c3 commit: 116e9c7e2b0c83556761f1e6187be3fdd4c60cb3 Author: Kent Fredric gentoo org> AuthorDate: Sun Aug 4 19:41:20 2019 +0000 Commit: Kent Fredric gentoo org> CommitDate: Sun Aug 4 20:06:25 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=116e9c7e dev-lang/moarvm: Update live ebuild - This brings the live ebuild up-to-date with changes already dropped in other ebuilds, and then some. - uses EAPI7 - Omits the 3rd party submodules from fetching - Removes the no-longer-used `jit` USE flag - USE="optimize" works again it seems - Update invocation of configure - Patch for configure seems no longer needed Package-Manager: Portage-2.3.66, Repoman-2.3.16 Signed-off-by: Kent Fredric gentoo.org> dev-lang/moarvm/moarvm-9999.ebuild | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/dev-lang/moarvm/moarvm-9999.ebuild b/dev-lang/moarvm/moarvm-9999.ebuild index f119a7ae28b..575bf022807 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 }