diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2015-01-15 01:55:10 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2015-01-15 01:55:10 +0000 |
| commit | 9140771a9f3dfae72fe926dafc24fc7d6ffc726f (patch) | |
| tree | 3b955d368c252a07863df6990f3909b2ad4ad09d /www-client | |
| parent | mask games-action/cylindrix for removal (diff) | |
| download | gentoo-2-9140771a9f3dfae72fe926dafc24fc7d6ffc726f.tar.gz gentoo-2-9140771a9f3dfae72fe926dafc24fc7d6ffc726f.tar.bz2 gentoo-2-9140771a9f3dfae72fe926dafc24fc7d6ffc726f.zip | |
Add back buildobj dir fix, bug #536516
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0xB4D088B4)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/firefox/ChangeLog | 5 | ||||
| -rw-r--r-- | www-client/firefox/firefox-35.0.ebuild | 21 |
2 files changed, 15 insertions, 11 deletions
diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog index 438435e3f0d4..adab4a9bfd26 100644 --- a/www-client/firefox/ChangeLog +++ b/www-client/firefox/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/firefox # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.377 2015/01/13 03:26:56 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.378 2015/01/15 01:55:10 anarchy Exp $ + + 15 Jan 2015; <anarchy@gentoo.org> firefox-35.0.ebuild: + Add back buildobj dir fix, bug #536516 *firefox-35.0 (13 Jan 2015) *firefox-31.4.0 (13 Jan 2015) diff --git a/www-client/firefox/firefox-35.0.ebuild b/www-client/firefox/firefox-35.0.ebuild index ea10a2c9e735..a902d66e80da 100644 --- a/www-client/firefox/firefox-35.0.ebuild +++ b/www-client/firefox/firefox-35.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-35.0.ebuild,v 1.1 2015/01/13 03:26:56 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-35.0.ebuild,v 1.2 2015/01/15 01:55:10 anarchy Exp $ EAPI="5" VIRTUALX_REQUIRED="pgo" @@ -91,6 +91,8 @@ fi QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox" +BUILD_OBJ_DIR="${S}/ff" + pkg_setup() { moz_pkgsetup @@ -229,6 +231,8 @@ src_configure() { echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig fi + echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig + # Finalize and report settings mozconfig_final @@ -278,33 +282,30 @@ src_install() { MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" DICTPATH="\"${EPREFIX}/usr/share/myspell\"" - # MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc. - local obj_dir="$(echo */config.log)" - obj_dir="${obj_dir%/*}" - cd "${S}/${obj_dir}" || die + cd "${BUILD_OBJ_DIR}" || die # Pax mark xpcshell for hardened support, only used for startupcache creation. - pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell + pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell # Add our default prefs for firefox cp "${FILESDIR}"/gentoo-default-prefs.js-1 \ - "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ + "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ || die # Set default path to search for dictionaries. echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \ - >> "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ + >> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ || die echo "pref(\"extensions.autoDisableScopes\", 3);" >> \ - "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ + "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ || die local plugin use gmp-autoupdate || for plugin in \ gmp-gmpopenh264 ; do echo "pref(\"media.${plugin}.autoupdate\", false);" >> \ - "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ + "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ || die done |