| 1 |
commit: e42c22df29664cb2fe2365ac5247b2f2183c8bc4 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 2 15:17:43 2016 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 2 15:19:25 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=e42c22df |
| 7 |
|
| 8 |
Make mozconfig-v6.45 use mozcoreconf-v4, and cleanup of firefox-45.1 ebuild to match |
| 9 |
|
| 10 |
eclass/mozconfig-v6.45.eclass | 2 +- |
| 11 |
www-client/firefox/firefox-45.1.0.ebuild | 9 --------- |
| 12 |
2 files changed, 1 insertion(+), 10 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/mozconfig-v6.45.eclass b/eclass/mozconfig-v6.45.eclass |
| 15 |
index 05127d2..544321f 100644 |
| 16 |
--- a/eclass/mozconfig-v6.45.eclass |
| 17 |
+++ b/eclass/mozconfig-v6.45.eclass |
| 18 |
@@ -27,7 +27,7 @@ case ${EAPI} in |
| 19 |
;; |
| 20 |
esac |
| 21 |
|
| 22 |
-inherit flag-o-matic toolchain-funcs mozcoreconf-v3 |
| 23 |
+inherit flag-o-matic toolchain-funcs mozcoreconf-v4 |
| 24 |
|
| 25 |
# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI |
| 26 |
# @DESCRIPTION: |
| 27 |
|
| 28 |
diff --git a/www-client/firefox/firefox-45.1.0.ebuild b/www-client/firefox/firefox-45.1.0.ebuild |
| 29 |
index 0404963..f0e2ba7 100644 |
| 30 |
--- a/www-client/firefox/firefox-45.1.0.ebuild |
| 31 |
+++ b/www-client/firefox/firefox-45.1.0.ebuild |
| 32 |
@@ -182,7 +182,6 @@ src_prepare() { |
| 33 |
} |
| 34 |
|
| 35 |
src_configure() { |
| 36 |
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
| 37 |
MEXTENSIONS="default" |
| 38 |
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) |
| 39 |
# Note: These are for Gentoo Linux use ONLY. For your own distribution, please |
| 40 |
@@ -198,9 +197,6 @@ src_configure() { |
| 41 |
mozconfig_init |
| 42 |
mozconfig_config |
| 43 |
|
| 44 |
- # We want rpath support to prevent unneeded hacks on different libc variants |
| 45 |
- append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}" |
| 46 |
- |
| 47 |
# It doesn't compile on alpha without this LDFLAGS |
| 48 |
use alpha && append-ldflags "-Wl,--no-relax" |
| 49 |
|
| 50 |
@@ -217,9 +213,6 @@ src_configure() { |
| 51 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
| 52 |
mozconfig_annotate '' --disable-mailnews |
| 53 |
|
| 54 |
- # Other ff-specific settings |
| 55 |
- mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
| 56 |
- |
| 57 |
# Allow for a proper pgo build |
| 58 |
if use pgo; then |
| 59 |
echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig |
| 60 |
@@ -272,8 +265,6 @@ src_compile() { |
| 61 |
} |
| 62 |
|
| 63 |
src_install() { |
| 64 |
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
| 65 |
- |
| 66 |
cd "${BUILD_OBJ_DIR}" || die |
| 67 |
|
| 68 |
# Add our default prefs for firefox |
Archives