| 1 |
commit: a77f9eaedc2f3cd77d367521336377f7e6664311 |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 27 19:59:32 2017 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 27 19:59:32 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=a77f9eae |
| 7 |
|
| 8 |
www-client/firefox - no longer support pgo builds on any level |
| 9 |
|
| 10 |
www-client/firefox/firefox-58.0_beta6.ebuild | 54 ++++------------------------ |
| 11 |
1 file changed, 7 insertions(+), 47 deletions(-) |
| 12 |
|
| 13 |
diff --git a/www-client/firefox/firefox-58.0_beta6.ebuild b/www-client/firefox/firefox-58.0_beta6.ebuild |
| 14 |
index c3df349..a7cc2c8 100644 |
| 15 |
--- a/www-client/firefox/firefox-58.0_beta6.ebuild |
| 16 |
+++ b/www-client/firefox/firefox-58.0_beta6.ebuild |
| 17 |
@@ -29,8 +29,8 @@ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" |
| 18 |
|
| 19 |
MOZCONFIG_OPTIONAL_WIFI=1 |
| 20 |
|
| 21 |
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.57 pax-utils xdg-utils autotools \ |
| 22 |
- virtualx mozlinguas-v2 |
| 23 |
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.57 \ |
| 24 |
+ pax-utils xdg-utils autotools mozlinguas-v2 |
| 25 |
|
| 26 |
DESCRIPTION="Firefox Web Browser" |
| 27 |
HOMEPAGE="http://www.mozilla.com/firefox" |
| 28 |
@@ -39,7 +39,7 @@ KEYWORDS="~amd64 ~x86" |
| 29 |
|
| 30 |
SLOT="0" |
| 31 |
LICENSE="MPL-2.0 GPL-2 LGPL-2.1" |
| 32 |
-IUSE="bindist eme-free +gmp-autoupdate hardened hwaccel jack nsplugin pgo +screenshot selinux test" |
| 33 |
+IUSE="bindist eme-free +gmp-autoupdate hardened hwaccel jack nsplugin +screenshot selinux test" |
| 34 |
RESTRICT="!bindist? ( bindist )" |
| 35 |
|
| 36 |
PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz ) |
| 37 |
@@ -60,7 +60,6 @@ DEPEND="${RDEPEND} |
| 38 |
>=dev-util/cargo-0.22.0 |
| 39 |
>=sys-devel/llvm-4.0.1 |
| 40 |
>=sys-devel/clang-4.0.1 |
| 41 |
- pgo? ( >=sys-devel/gcc-4.9.0 ) |
| 42 |
amd64? ( ${ASM_DEPEND} virtual/opengl ) |
| 43 |
x86? ( ${ASM_DEPEND} virtual/opengl )" |
| 44 |
|
| 45 |
@@ -95,21 +94,12 @@ pkg_setup() { |
| 46 |
elog "a legal problem with Mozilla Foundation" |
| 47 |
elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" |
| 48 |
fi |
| 49 |
- |
| 50 |
- if use pgo; then |
| 51 |
- einfo |
| 52 |
- ewarn "You will do a double build for profile guided optimization." |
| 53 |
- ewarn "This will result in your build taking at least twice as long as before." |
| 54 |
- fi |
| 55 |
} |
| 56 |
|
| 57 |
pkg_pretend() { |
| 58 |
# Ensure we have enough disk space to compile |
| 59 |
- if use pgo || use debug || use test ; then |
| 60 |
- CHECKREQS_DISK_BUILD="8G" |
| 61 |
- else |
| 62 |
- CHECKREQS_DISK_BUILD="4G" |
| 63 |
- fi |
| 64 |
+ CHECKREQS_DISK_BUILD="4G" |
| 65 |
+ |
| 66 |
check-reqs_pkg_setup |
| 67 |
} |
| 68 |
|
| 69 |
@@ -216,11 +206,6 @@ src_configure() { |
| 70 |
|
| 71 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
| 72 |
|
| 73 |
- # Allow for a proper pgo build |
| 74 |
- if use pgo; then |
| 75 |
- echo "mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 \$(MAKE) -C \$(MOZ_OBJDIR) pgo-profile-run'" >> "${S}"/.mozconfig |
| 76 |
- fi |
| 77 |
- |
| 78 |
echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig |
| 79 |
echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig |
| 80 |
|
| 81 |
@@ -234,34 +219,9 @@ src_configure() { |
| 82 |
|
| 83 |
src_compile() { |
| 84 |
addpredict /proc/self/oom_score_adj |
| 85 |
- if use pgo; then |
| 86 |
- addpredict /root |
| 87 |
- addpredict /etc/gconf |
| 88 |
- # Reset and cleanup environment variables used by GNOME/XDG |
| 89 |
- gnome2_environment_reset |
| 90 |
- |
| 91 |
- # Firefox tries to use dri stuff when it's run, see bug 380283 |
| 92 |
- shopt -s nullglob |
| 93 |
- cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') |
| 94 |
- if test -z "${cards}"; then |
| 95 |
- cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g') |
| 96 |
- if test -n "${cards}"; then |
| 97 |
- # Binary drivers seem to cause access violations anyway, so |
| 98 |
- # let's use indirect rendering so that the device files aren't |
| 99 |
- # touched at all. See bug 394715. |
| 100 |
- export LIBGL_ALWAYS_INDIRECT=1 |
| 101 |
- fi |
| 102 |
- fi |
| 103 |
- shopt -u nullglob |
| 104 |
- [[ -n "${cards}" ]] && addpredict "${cards}" |
| 105 |
- |
| 106 |
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ |
| 107 |
- virtx emake -f client.mk profiledbuild || die "virtx emake failed" |
| 108 |
- else |
| 109 |
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ |
| 110 |
- ./mach build |
| 111 |
- fi |
| 112 |
|
| 113 |
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ |
| 114 |
+ ./mach build |
| 115 |
} |
| 116 |
|
| 117 |
src_install() { |
Archives