| 1 |
commit: d3d68c84070e84997faf0c1d98b0eb6762f8e331 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 31 15:49:31 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 31 15:56:27 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d68c84 |
| 7 |
|
| 8 |
www-client/firefox: force stderr for ewarn in llvm_check_deps() |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/695668 |
| 11 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
www-client/firefox/firefox-68.2.0.ebuild | 19 +++++++++---------- |
| 15 |
www-client/firefox/firefox-70.0.ebuild | 19 +++++++++---------- |
| 16 |
2 files changed, 18 insertions(+), 20 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-client/firefox/firefox-68.2.0.ebuild b/www-client/firefox/firefox-68.2.0.ebuild |
| 19 |
index b51a15732d0..7c5b0d66a9e 100644 |
| 20 |
--- a/www-client/firefox/firefox-68.2.0.ebuild |
| 21 |
+++ b/www-client/firefox/firefox-68.2.0.ebuild |
| 22 |
@@ -189,37 +189,36 @@ fi |
| 23 |
|
| 24 |
llvm_check_deps() { |
| 25 |
if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then |
| 26 |
- ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." |
| 27 |
+ ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 28 |
return 1 |
| 29 |
fi |
| 30 |
|
| 31 |
- if use pgo ; then |
| 32 |
- if ! has usersandbox $FEATURES ; then |
| 33 |
- eerror "You must enable usersandbox as X server can not run as root!" |
| 34 |
- fi |
| 35 |
- fi |
| 36 |
- |
| 37 |
if use clang ; then |
| 38 |
if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then |
| 39 |
- ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." |
| 40 |
+ ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 41 |
return 1 |
| 42 |
fi |
| 43 |
|
| 44 |
if use pgo ; then |
| 45 |
if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then |
| 46 |
- ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." |
| 47 |
+ ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 48 |
return 1 |
| 49 |
fi |
| 50 |
fi |
| 51 |
fi |
| 52 |
|
| 53 |
- # <EAPI 7 workaround, #695668 |
| 54 |
einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2 |
| 55 |
} |
| 56 |
|
| 57 |
pkg_setup() { |
| 58 |
moz_pkgsetup |
| 59 |
|
| 60 |
+ if use pgo ; then |
| 61 |
+ if ! has usersandbox $FEATURES ; then |
| 62 |
+ die "You must enable usersandbox as X server can not run as root!" |
| 63 |
+ fi |
| 64 |
+ fi |
| 65 |
+ |
| 66 |
# Avoid PGO profiling problems due to enviroment leakage |
| 67 |
# These should *always* be cleaned up anyway |
| 68 |
unset DBUS_SESSION_BUS_ADDRESS \ |
| 69 |
|
| 70 |
diff --git a/www-client/firefox/firefox-70.0.ebuild b/www-client/firefox/firefox-70.0.ebuild |
| 71 |
index c4e0acf0788..e043eb80210 100644 |
| 72 |
--- a/www-client/firefox/firefox-70.0.ebuild |
| 73 |
+++ b/www-client/firefox/firefox-70.0.ebuild |
| 74 |
@@ -192,37 +192,36 @@ fi |
| 75 |
|
| 76 |
llvm_check_deps() { |
| 77 |
if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then |
| 78 |
- ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." |
| 79 |
+ ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 80 |
return 1 |
| 81 |
fi |
| 82 |
|
| 83 |
- if use pgo ; then |
| 84 |
- if ! has usersandbox $FEATURES ; then |
| 85 |
- eerror "You must enable usersandbox as X server can not run as root!" |
| 86 |
- fi |
| 87 |
- fi |
| 88 |
- |
| 89 |
if use clang ; then |
| 90 |
if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then |
| 91 |
- ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." |
| 92 |
+ ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 93 |
return 1 |
| 94 |
fi |
| 95 |
|
| 96 |
if use pgo ; then |
| 97 |
if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then |
| 98 |
- ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." |
| 99 |
+ ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 100 |
return 1 |
| 101 |
fi |
| 102 |
fi |
| 103 |
fi |
| 104 |
|
| 105 |
- # <EAPI 7 workaround, #695668 |
| 106 |
einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2 |
| 107 |
} |
| 108 |
|
| 109 |
pkg_setup() { |
| 110 |
moz_pkgsetup |
| 111 |
|
| 112 |
+ if use pgo ; then |
| 113 |
+ if ! has usersandbox $FEATURES ; then |
| 114 |
+ die "You must enable usersandbox as X server can not run as root!" |
| 115 |
+ fi |
| 116 |
+ fi |
| 117 |
+ |
| 118 |
# Avoid PGO profiling problems due to enviroment leakage |
| 119 |
# These should *always* be cleaned up anyway |
| 120 |
unset DBUS_SESSION_BUS_ADDRESS \ |
Archives