From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-853114-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id D0F6F1388C2
for <garchives@archives.gentoo.org>; Wed, 23 Dec 2015 21:52:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B2E0721C0F4;
Wed, 23 Dec 2015 21:52:27 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 26DE821C0F5
for <gentoo-commits@lists.gentoo.org>; Wed, 23 Dec 2015 21:52:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E8BC6340739
for <gentoo-commits@lists.gentoo.org>; Wed, 23 Dec 2015 21:52:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B20ECEB
for <gentoo-commits@lists.gentoo.org>; Wed, 23 Dec 2015 21:52:23 +0000 (UTC)
From: "Ian Stakenvicius" <axs@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" <axs@gentoo.org>
Message-ID: <1450907521.ebf170de7168b95e187f10a4b0aa230d01683a2a.axs@gentoo>
Subject: [gentoo-commits] proj/mozilla:crossdev commit in: www-client/firefox/
X-VCS-Repository: proj/mozilla
X-VCS-Files: www-client/firefox/firefox-43.0.ebuild
X-VCS-Directories: www-client/firefox/
X-VCS-Committer: axs
X-VCS-Committer-Name: Ian Stakenvicius
X-VCS-Revision: ebf170de7168b95e187f10a4b0aa230d01683a2a
X-VCS-Branch: crossdev
Date: Wed, 23 Dec 2015 21:52:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: e6547b11-2536-49d3-9929-7e55132e0f64
X-Archives-Hash: 924cfb60a66fce76b65e5e4450a711ef
commit: ebf170de7168b95e187f10a4b0aa230d01683a2a
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:52:01 2015 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=ebf170de
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