From 11dfd033459deeac330320ec5e52197769b53599 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Sat, 21 Sep 2019 15:00:15 +0200 Subject: [PATCH] www-client/firefox: allow LLVM 9.x Signed-off-by: Thomas Deutschmann --- eclass/mozconfig-v6.60.eclass | 8 ++++++++ www-client/firefox/firefox-60.8.0.ebuild | 2 +- www-client/firefox/firefox-60.9.0.ebuild | 2 +- www-client/firefox/firefox-68.1.0.ebuild | 11 ++++++++++- www-client/firefox/firefox-69.0.1.ebuild | 11 ++++++++++- 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass index 2a6e0e07bb60..ae83ebd6c314 100644 --- a/eclass/mozconfig-v6.60.eclass +++ b/eclass/mozconfig-v6.60.eclass @@ -159,6 +159,14 @@ DEPEND="app-arch/zip >=sys-devel/binutils-2.30 sys-apps/findutils || ( + ( + sys-devel/clang:9 + !clang? ( sys-devel/llvm:9 ) + clang? ( + =sys-devel/lld-9* + sys-devel/llvm:9[gold] + ) + ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) diff --git a/www-client/firefox/firefox-60.8.0.ebuild b/www-client/firefox/firefox-60.8.0.ebuild index 26d72d83b619..55b73e4e2b95 100644 --- a/www-client/firefox/firefox-60.8.0.ebuild +++ b/www-client/firefox/firefox-60.8.0.ebuild @@ -35,7 +35,7 @@ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" MOZCONFIG_OPTIONAL_WIFI=1 -LLVM_MAX_SLOT=8 +LLVM_MAX_SLOT=9 inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \ mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2 diff --git a/www-client/firefox/firefox-60.9.0.ebuild b/www-client/firefox/firefox-60.9.0.ebuild index 19831e39cc87..47b80028876b 100644 --- a/www-client/firefox/firefox-60.9.0.ebuild +++ b/www-client/firefox/firefox-60.9.0.ebuild @@ -34,7 +34,7 @@ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" MOZCONFIG_OPTIONAL_WIFI=1 -LLVM_MAX_SLOT=8 +LLVM_MAX_SLOT=9 inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \ mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2 diff --git a/www-client/firefox/firefox-68.1.0.ebuild b/www-client/firefox/firefox-68.1.0.ebuild index d2ca2f5da566..4cf11539cb49 100644 --- a/www-client/firefox/firefox-68.1.0.ebuild +++ b/www-client/firefox/firefox-68.1.0.ebuild @@ -38,7 +38,7 @@ if [[ "${PV}" == *_rc* ]]; then MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz" fi -LLVM_MAX_SLOT=8 +LLVM_MAX_SLOT=9 inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \ gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \ @@ -125,6 +125,15 @@ DEPEND="${CDEPEND} >=sys-devel/binutils-2.30 sys-apps/findutils || ( + ( + sys-devel/clang:9 + !clang? ( sys-devel/llvm:9 ) + clang? ( + =sys-devel/lld-9* + sys-devel/llvm:9[gold] + pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) + ) + ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) diff --git a/www-client/firefox/firefox-69.0.1.ebuild b/www-client/firefox/firefox-69.0.1.ebuild index 52dfab5d47de..1bdcc49ef7fc 100644 --- a/www-client/firefox/firefox-69.0.1.ebuild +++ b/www-client/firefox/firefox-69.0.1.ebuild @@ -38,7 +38,7 @@ if [[ "${PV}" == *_rc* ]]; then MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz" fi -LLVM_MAX_SLOT=8 +LLVM_MAX_SLOT=9 inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \ gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \ @@ -127,6 +127,15 @@ DEPEND="${CDEPEND} >=sys-devel/binutils-2.30 sys-apps/findutils || ( + ( + sys-devel/clang:9 + !clang? ( sys-devel/llvm:9 ) + clang? ( + =sys-devel/lld-9* + sys-devel/llvm:9[gold] + pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) + ) + ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) -- 2.26.2