From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6ADF9139083 for ; Thu, 21 Dec 2017 14:12:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B09FEE0F81; Thu, 21 Dec 2017 14:12:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 918DFE0F81 for ; Thu, 21 Dec 2017 14:12:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C2BE3402FE for ; Thu, 21 Dec 2017 14:12:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8A26A6AE for ; Thu, 21 Dec 2017 14:12:42 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1513865350.cd64d7a99838e64000fa9d95da3b94da4b2e28ed.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: eclass/, www-client/firefox/ X-VCS-Repository: proj/mozilla X-VCS-Files: eclass/mozcoreconf-v5.eclass www-client/firefox/firefox-58.0_beta12.ebuild X-VCS-Directories: eclass/ www-client/firefox/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: cd64d7a99838e64000fa9d95da3b94da4b2e28ed X-VCS-Branch: master Date: Thu, 21 Dec 2017 14:12:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 87aed757-f8b8-4cc2-a139-c9ee6ef56084 X-Archives-Hash: 26f67607d9d32cff7cbf18dcd036c12b commit: cd64d7a99838e64000fa9d95da3b94da4b2e28ed Author: Jory A. Pratt gentoo org> AuthorDate: Thu Dec 21 14:09:10 2017 +0000 Commit: Jory Pratt gentoo org> CommitDate: Thu Dec 21 14:09:10 2017 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=cd64d7a9 www-client/firefox - Revert eclass and remove unsupported configure option via ebuild eclass/mozcoreconf-v5.eclass | 6 ++---- www-client/firefox/firefox-58.0_beta12.ebuild | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/eclass/mozcoreconf-v5.eclass b/eclass/mozcoreconf-v5.eclass index e62193d..02ade39 100644 --- a/eclass/mozcoreconf-v5.eclass +++ b/eclass/mozcoreconf-v5.eclass @@ -87,7 +87,7 @@ moz_pkgsetup() { # Ensure we use correct toolchain export HOST_CC="$(tc-getBUILD_CC)" export HOST_CXX="$(tc-getBUILD_CXX)" - tc-export CC CXX LD PKG_CONFIG AR RANLIB + tc-export CC CXX LD PKG_CONFIG # Ensure that we have a sane build enviroment export MOZILLA_CLIENT=1 @@ -224,9 +224,7 @@ mozconfig_init() { # Use the MOZILLA_FIVE_HOME for the rpath append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags # Set MOZILLA_FIVE_HOME in mozconfig - if [[ ${PV} -lt 58.0 ]]; then - mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} - fi + mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} #################################### # diff --git a/www-client/firefox/firefox-58.0_beta12.ebuild b/www-client/firefox/firefox-58.0_beta12.ebuild index 4b786b2..cf52f93 100644 --- a/www-client/firefox/firefox-58.0_beta12.ebuild +++ b/www-client/firefox/firefox-58.0_beta12.ebuild @@ -211,6 +211,9 @@ src_configure() { echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig + # Default mozilla_five_home no longer valid option + sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig + # Finalize and report settings mozconfig_final