summaryrefslogtreecommitdiff
path: root/eclass/mozconfig-v6.60.eclass
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-10-07 11:03:14 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-10-07 11:03:14 +0100
commit957235cf19a691360c720f7913672adda4258ed0 (patch)
tree812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /eclass/mozconfig-v6.60.eclass
parent62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff)
gentoo resync : 07.10.2018
Diffstat (limited to 'eclass/mozconfig-v6.60.eclass')
-rw-r--r--eclass/mozconfig-v6.60.eclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass
index b86fa2a0dc62..de09ebcd6408 100644
--- a/eclass/mozconfig-v6.60.eclass
+++ b/eclass/mozconfig-v6.60.eclass
@@ -101,7 +101,7 @@ RDEPEND=">=app-text/hunspell-1.5.4:=
>=x11-libs/pixman-0.19.2
>=dev-libs/glib-2.26:2
>=sys-libs/zlib-1.2.3
- >=virtual/libffi-3.0.10
+ >=virtual/libffi-3.0.10:=
virtual/ffmpeg
x11-libs/libX11
x11-libs/libXcomposite
@@ -203,7 +203,7 @@ mozconfig_config() {
# Force gcc
einfo "Enforcing the use of gcc due to USE=-clang ..."
CC=${CHOST}-gcc
- CXX=${CHOST}-gcc++
+ CXX=${CHOST}-g++
strip-unsupported-flags
fi
@@ -212,9 +212,6 @@ mozconfig_config() {
--with-system-zlib \
--with-system-bz2
- # Stylo is only broken on x86 builds
- use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
-
# Stylo is horribly broken on arm, renders GUI unusable
use arm && mozconfig_annotate 'breaks UI on arm' --disable-stylo
@@ -331,7 +328,10 @@ mozconfig_config() {
mozconfig_use_with system-harfbuzz
mozconfig_use_with system-harfbuzz system-graphite2
- if use arm ; then
+ if use clang ; then
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
+ mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
+ elif use arm ; then
mozconfig_annotate 'elf-hack is broken on arm' --disable-elf-hack
fi