[gentoo-commits] proj/mozilla:crossdev commit in: www-client/firefox/

[Ian Stakenvicius]

commit:     ef9c8a80342c5a18af5038c7c41ba96da641a7e2
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 19:31:41 2015 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 21:40:34 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=ef9c8a80

add nss.m4 patch and modify firefox-43 for crossdev testing

 www-client/firefox/firefox-43.0.ebuild | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/www-client/firefox/firefox-43.0.ebuild 
b/www-client/firefox/firefox-43.0.ebuild
index d0229f5..5e3932a 100644
--- a/www-client/firefox/firefox-43.0.ebuild
+++ b/www-client/firefox/firefox-43.0.ebuild
@@ -148,6 +148,7 @@ src_prepare() {
        EPATCH_EXCLUDE="8002_jemalloc_configure_unbashify.patch
                        8011_bug1194520-freetype261_until_moz43.patch" \
        epatch "${WORKDIR}/firefox"
+       epatch "${FILESDIR}"/nss.m4.pkg-config.patch
 
        # Allow user to apply any additional patches without modifing ebuild
        epatch_user
@@ -195,7 +196,6 @@ src_prepare() {
 }
 
 src_configure() {
-       MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
        MEXTENSIONS="default"
        # Google API keys (see 
http://www.chromium.org/developers/how-tos/api-keys)
        # Note: These are for Gentoo Linux use ONLY. For your own distribution, 
please
@@ -211,9 +211,6 @@ src_configure() {
        mozconfig_init
        mozconfig_config
 
-       # We want rpath support to prevent unneeded hacks on different libc 
variants
-       append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
-
        # It doesn't compile on alpha without this LDFLAGS
        use alpha && append-ldflags "-Wl,--no-relax"
 
@@ -229,9 +226,6 @@ src_configure() {
        mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
        mozconfig_annotate '' --disable-mailnews
 
-       # Other ff-specific settings
-       mozconfig_annotate '' 
--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
        # Allow for a proper pgo build
        if use pgo; then
                echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) 
\$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
@@ -272,11 +266,9 @@ src_compile() {
                shopt -u nullglob
                addpredict "${cards}"
 
-               CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
                MOZ_MAKE_FLAGS="${MAKEOPTS}" 
SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
                Xemake -f client.mk profiledbuild || die "Xemake failed"
        else
-               CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
                MOZ_MAKE_FLAGS="${MAKEOPTS}" 
SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
                emake -f client.mk realbuild
        fi
@@ -284,7 +276,6 @@ src_compile() {
 }
 
 src_install() {
-       MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
        DICTPATH="\"${EPREFIX}/usr/share/myspell\""
 
        cd "${BUILD_OBJ_DIR}" || die