commit: 786b1919df5c2d4c5223cd6be24210d77bc115d6 Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Fri Oct 27 12:48:05 2017 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> 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
