From cd64d7a99838e64000fa9d95da3b94da4b2e28ed Mon Sep 17 00:00:00 2001 From: "Jory A. Pratt" Date: Thu, 21 Dec 2017 08:09:10 -0600 Subject: 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 e62193d1..02ade399 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 4b786b22..cf52f93a 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 -- cgit v1.2.3-65-gdbad