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 AFC0D1381F3 for ; Mon, 7 Sep 2020 21:59:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB313E0AE3; Mon, 7 Sep 2020 21:59:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 86AA9E0AE3 for ; Mon, 7 Sep 2020 21:59:17 +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 5E2AB335C97 for ; Mon, 7 Sep 2020 21:59:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F8B226 for ; Mon, 7 Sep 2020 21:59:15 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1599515946.2caf8004b7c582d65d1d01a96f32febdedcb8fdd.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild X-VCS-Directories: dev-lang/spidermonkey/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 2caf8004b7c582d65d1d01a96f32febdedcb8fdd X-VCS-Branch: master Date: Mon, 7 Sep 2020 21:59:15 +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: a8c3d17c-d40b-4797-838f-d1a468a6c266 X-Archives-Hash: 0add1e0e3fd3d154e3c38a69bbb92d85 commit: 2caf8004b7c582d65d1d01a96f32febdedcb8fdd Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Sep 7 21:20:59 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Sep 7 21:59:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2caf8004 dev-lang/spidermonkey: clang/LLVM is required Closes: https://bugs.gentoo.org/740890 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann gentoo.org> dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild index c41e32dbc5c..28d49a10116 100644 --- a/dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild @@ -7,7 +7,9 @@ PYTHON_COMPAT=( python3_{6..9} ) WANT_AUTOCONF="2.1" -inherit autotools check-reqs multiprocessing python-any-r1 +LLVM_MAX_SLOT=10 + +inherit autotools check-reqs llvm multiprocessing python-any-r1 MY_PN="mozjs" MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases @@ -58,6 +60,7 @@ IUSE="debug +jit test" RESTRICT="!test? ( test )" BDEPEND="${PYTHON_DEPS} + sys-devel/clang >=virtual/rust-1.43.0 virtual/pkgconfig" @@ -75,6 +78,15 @@ RDEPEND="${CDEPEND}" S="${WORKDIR}/firefox-${MY_PV}/js/src" +llvm_check_deps() { + if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then + ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + return 1 + fi + + einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2 +} + python_check_deps() { if use test ; then has_version "dev-python/six[${PYTHON_USEDEP}]" @@ -100,6 +112,8 @@ pkg_setup() { check-reqs_pkg_setup + llvm_pkg_setup + python-any-r1_pkg_setup }