| 1 |
commit: ebf170de7168b95e187f10a4b0aa230d01683a2a |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 16 19:31:41 2015 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 23 21:52:01 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=ebf170de |
| 7 |
|
| 8 |
add nss.m4 patch and modify firefox-43 for crossdev testing |
| 9 |
|
| 10 |
www-client/firefox/firefox-43.0.ebuild | 11 +---------- |
| 11 |
1 file changed, 1 insertion(+), 10 deletions(-) |
| 12 |
|
| 13 |
diff --git a/www-client/firefox/firefox-43.0.ebuild b/www-client/firefox/firefox-43.0.ebuild |
| 14 |
index d0229f5..5e3932a 100644 |
| 15 |
--- a/www-client/firefox/firefox-43.0.ebuild |
| 16 |
+++ b/www-client/firefox/firefox-43.0.ebuild |
| 17 |
@@ -148,6 +148,7 @@ src_prepare() { |
| 18 |
EPATCH_EXCLUDE="8002_jemalloc_configure_unbashify.patch |
| 19 |
8011_bug1194520-freetype261_until_moz43.patch" \ |
| 20 |
epatch "${WORKDIR}/firefox" |
| 21 |
+ epatch "${FILESDIR}"/nss.m4.pkg-config.patch |
| 22 |
|
| 23 |
# Allow user to apply any additional patches without modifing ebuild |
| 24 |
epatch_user |
| 25 |
@@ -195,7 +196,6 @@ src_prepare() { |
| 26 |
} |
| 27 |
|
| 28 |
src_configure() { |
| 29 |
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
| 30 |
MEXTENSIONS="default" |
| 31 |
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) |
| 32 |
# Note: These are for Gentoo Linux use ONLY. For your own distribution, please |
| 33 |
@@ -211,9 +211,6 @@ src_configure() { |
| 34 |
mozconfig_init |
| 35 |
mozconfig_config |
| 36 |
|
| 37 |
- # We want rpath support to prevent unneeded hacks on different libc variants |
| 38 |
- append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}" |
| 39 |
- |
| 40 |
# It doesn't compile on alpha without this LDFLAGS |
| 41 |
use alpha && append-ldflags "-Wl,--no-relax" |
| 42 |
|
| 43 |
@@ -229,9 +226,6 @@ src_configure() { |
| 44 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
| 45 |
mozconfig_annotate '' --disable-mailnews |
| 46 |
|
| 47 |
- # Other ff-specific settings |
| 48 |
- mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
| 49 |
- |
| 50 |
# Allow for a proper pgo build |
| 51 |
if use pgo; then |
| 52 |
echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig |
| 53 |
@@ -272,11 +266,9 @@ src_compile() { |
| 54 |
shopt -u nullglob |
| 55 |
addpredict "${cards}" |
| 56 |
|
| 57 |
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
| 58 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ |
| 59 |
Xemake -f client.mk profiledbuild || die "Xemake failed" |
| 60 |
else |
| 61 |
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
| 62 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ |
| 63 |
emake -f client.mk realbuild |
| 64 |
fi |
| 65 |
@@ -284,7 +276,6 @@ src_compile() { |
| 66 |
} |
| 67 |
|
| 68 |
src_install() { |
| 69 |
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
| 70 |
DICTPATH="\"${EPREFIX}/usr/share/myspell\"" |
| 71 |
|
| 72 |
cd "${BUILD_OBJ_DIR}" || die |
Archives