| 1 |
commit: 11dfd033459deeac330320ec5e52197769b53599 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 21 13:00:15 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 21 13:04:42 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11dfd033 |
| 7 |
|
| 8 |
www-client/firefox: allow LLVM 9.x |
| 9 |
|
| 10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/mozconfig-v6.60.eclass | 8 ++++++++ |
| 13 |
www-client/firefox/firefox-60.8.0.ebuild | 2 +- |
| 14 |
www-client/firefox/firefox-60.9.0.ebuild | 2 +- |
| 15 |
www-client/firefox/firefox-68.1.0.ebuild | 11 ++++++++++- |
| 16 |
www-client/firefox/firefox-69.0.1.ebuild | 11 ++++++++++- |
| 17 |
5 files changed, 30 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass |
| 20 |
index 2a6e0e07bb6..ae83ebd6c31 100644 |
| 21 |
--- a/eclass/mozconfig-v6.60.eclass |
| 22 |
+++ b/eclass/mozconfig-v6.60.eclass |
| 23 |
@@ -159,6 +159,14 @@ DEPEND="app-arch/zip |
| 24 |
>=sys-devel/binutils-2.30 |
| 25 |
sys-apps/findutils |
| 26 |
|| ( |
| 27 |
+ ( |
| 28 |
+ sys-devel/clang:9 |
| 29 |
+ !clang? ( sys-devel/llvm:9 ) |
| 30 |
+ clang? ( |
| 31 |
+ =sys-devel/lld-9* |
| 32 |
+ sys-devel/llvm:9[gold] |
| 33 |
+ ) |
| 34 |
+ ) |
| 35 |
( |
| 36 |
sys-devel/clang:8 |
| 37 |
!clang? ( sys-devel/llvm:8 ) |
| 38 |
|
| 39 |
diff --git a/www-client/firefox/firefox-60.8.0.ebuild b/www-client/firefox/firefox-60.8.0.ebuild |
| 40 |
index 26d72d83b61..55b73e4e2b9 100644 |
| 41 |
--- a/www-client/firefox/firefox-60.8.0.ebuild |
| 42 |
+++ b/www-client/firefox/firefox-60.8.0.ebuild |
| 43 |
@@ -35,7 +35,7 @@ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" |
| 44 |
|
| 45 |
MOZCONFIG_OPTIONAL_WIFI=1 |
| 46 |
|
| 47 |
-LLVM_MAX_SLOT=8 |
| 48 |
+LLVM_MAX_SLOT=9 |
| 49 |
|
| 50 |
inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \ |
| 51 |
mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2 |
| 52 |
|
| 53 |
diff --git a/www-client/firefox/firefox-60.9.0.ebuild b/www-client/firefox/firefox-60.9.0.ebuild |
| 54 |
index 19831e39cc8..47b80028876 100644 |
| 55 |
--- a/www-client/firefox/firefox-60.9.0.ebuild |
| 56 |
+++ b/www-client/firefox/firefox-60.9.0.ebuild |
| 57 |
@@ -34,7 +34,7 @@ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" |
| 58 |
|
| 59 |
MOZCONFIG_OPTIONAL_WIFI=1 |
| 60 |
|
| 61 |
-LLVM_MAX_SLOT=8 |
| 62 |
+LLVM_MAX_SLOT=9 |
| 63 |
|
| 64 |
inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \ |
| 65 |
mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2 |
| 66 |
|
| 67 |
diff --git a/www-client/firefox/firefox-68.1.0.ebuild b/www-client/firefox/firefox-68.1.0.ebuild |
| 68 |
index d2ca2f5da56..4cf11539cb4 100644 |
| 69 |
--- a/www-client/firefox/firefox-68.1.0.ebuild |
| 70 |
+++ b/www-client/firefox/firefox-68.1.0.ebuild |
| 71 |
@@ -38,7 +38,7 @@ if [[ "${PV}" == *_rc* ]]; then |
| 72 |
MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz" |
| 73 |
fi |
| 74 |
|
| 75 |
-LLVM_MAX_SLOT=8 |
| 76 |
+LLVM_MAX_SLOT=9 |
| 77 |
|
| 78 |
inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \ |
| 79 |
gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \ |
| 80 |
@@ -125,6 +125,15 @@ DEPEND="${CDEPEND} |
| 81 |
>=sys-devel/binutils-2.30 |
| 82 |
sys-apps/findutils |
| 83 |
|| ( |
| 84 |
+ ( |
| 85 |
+ sys-devel/clang:9 |
| 86 |
+ !clang? ( sys-devel/llvm:9 ) |
| 87 |
+ clang? ( |
| 88 |
+ =sys-devel/lld-9* |
| 89 |
+ sys-devel/llvm:9[gold] |
| 90 |
+ pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) |
| 91 |
+ ) |
| 92 |
+ ) |
| 93 |
( |
| 94 |
sys-devel/clang:8 |
| 95 |
!clang? ( sys-devel/llvm:8 ) |
| 96 |
|
| 97 |
diff --git a/www-client/firefox/firefox-69.0.1.ebuild b/www-client/firefox/firefox-69.0.1.ebuild |
| 98 |
index 52dfab5d47d..1bdcc49ef7f 100644 |
| 99 |
--- a/www-client/firefox/firefox-69.0.1.ebuild |
| 100 |
+++ b/www-client/firefox/firefox-69.0.1.ebuild |
| 101 |
@@ -38,7 +38,7 @@ if [[ "${PV}" == *_rc* ]]; then |
| 102 |
MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz" |
| 103 |
fi |
| 104 |
|
| 105 |
-LLVM_MAX_SLOT=8 |
| 106 |
+LLVM_MAX_SLOT=9 |
| 107 |
|
| 108 |
inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \ |
| 109 |
gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \ |
| 110 |
@@ -127,6 +127,15 @@ DEPEND="${CDEPEND} |
| 111 |
>=sys-devel/binutils-2.30 |
| 112 |
sys-apps/findutils |
| 113 |
|| ( |
| 114 |
+ ( |
| 115 |
+ sys-devel/clang:9 |
| 116 |
+ !clang? ( sys-devel/llvm:9 ) |
| 117 |
+ clang? ( |
| 118 |
+ =sys-devel/lld-9* |
| 119 |
+ sys-devel/llvm:9[gold] |
| 120 |
+ pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) |
| 121 |
+ ) |
| 122 |
+ ) |
| 123 |
( |
| 124 |
sys-devel/clang:8 |
| 125 |
!clang? ( sys-devel/llvm:8 ) |
Archives