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 5250A1396D9 for ; Fri, 27 Oct 2017 12:48:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88F5BE070D; Fri, 27 Oct 2017 12:48:34 +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 65808E070D for ; Fri, 27 Oct 2017 12:48:34 +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 4A61D33BEC7 for ; Fri, 27 Oct 2017 12:48:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FE44807 for ; Fri, 27 Oct 2017 12:48:32 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1509108485.786b1919df5c2d4c5223cd6be24210d77bc115d6.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/firefox/firefox-57.0_beta11.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 786b1919df5c2d4c5223cd6be24210d77bc115d6 X-VCS-Branch: master Date: Fri, 27 Oct 2017 12:48:32 +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-Archives-Salt: d6832530-ee5e-4ba0-95c2-f17740165287 X-Archives-Hash: 6d9363c5bc15588bb0c99c9c9cbb016b commit: 786b1919df5c2d4c5223cd6be24210d77bc115d6 Author: Jory A. Pratt gentoo org> AuthorDate: Fri Oct 27 12:48:05 2017 +0000 Commit: Jory Pratt gentoo org> CommitDate: Fri Oct 27 12:48:05 2017 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=786b1919 www-client/firefox - fix llvm/clang dep www-client/firefox/firefox-57.0_beta11.ebuild | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/www-client/firefox/firefox-57.0_beta11.ebuild b/www-client/firefox/firefox-57.0_beta11.ebuild index 2b887fc..3bbfbc1 100644 --- a/www-client/firefox/firefox-57.0_beta11.ebuild +++ b/www-client/firefox/firefox-57.0_beta11.ebuild @@ -5,7 +5,6 @@ EAPI=6 VIRTUALX_REQUIRED="pgo" WANT_AUTOCONF="2.1" MOZ_ESR="" -LLVM_MAX_SLOT="4" # This list can be updated with scripts/get_langs.sh from the mozilla overlay MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb @@ -31,7 +30,7 @@ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" MOZCONFIG_OPTIONAL_WIFI=1 inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.57 pax-utils xdg-utils autotools \ - virtualx mozlinguas-v2 llvm + virtualx mozlinguas-v2 DESCRIPTION="Firefox Web Browser" HOMEPAGE="http://www.mozilla.com/firefox" @@ -59,8 +58,8 @@ RDEPEND=" DEPEND="${RDEPEND} pgo? ( >=sys-devel/gcc-4.5 ) amd64? ( ${ASM_DEPEND} virtual/opengl - sys-devel/llvm:4 - sys-devel/clang:4 ) + >=sys-devel/llvm-4.0.1 + >=sys-devel/clang-4.0.1 ) x86? ( ${ASM_DEPEND} virtual/opengl )" S="${WORKDIR}/firefox-${MOZ_PV}" @@ -77,10 +76,9 @@ fi pkg_setup() { moz_pkgsetup - llvm_pkg_setup + # Build stylo - use amd64 && export BINDGEN_CFLAGS=$(pkg-config --cflags nspr pixman-1 | xargs) \ - LLVMCONFIG=$(get_llvm_prefix "$LLVM_MAX_SLOT")/bin/llvm-config + use amd64 && export BINDGEN_CFLAGS=$(pkg-config --cflags nspr pixman-1 | xargs) # Avoid PGO profiling problems due to enviroment leakage # These should *always* be cleaned up anyway