diff options
| author |   Jory A. Pratt <anarchy@gentoo.org> | 2015-01-14 19:50:45 -0600 |
|---|---|---|
| committer | Jory A. Pratt <anarchy@gentoo.org> | 2015-01-14 19:51:45 -0600 |
| commit | f9d24c9e19828b554778b2b776d867f739e08ff7 (patch) | |
| tree | 8cb0041f8374afd97a311718a6ccf2dd4a045268 | |
| parent | seamonkey: update to latest release. (diff) | |
| download | mozilla-f9d24c9e19828b554778b2b776d867f739e08ff7.tar.gz mozilla-f9d24c9e19828b554778b2b776d867f739e08ff7.tar.bz2 mozilla-f9d24c9e19828b554778b2b776d867f739e08ff7.zip | |
Add back buildobj dir fix, bug #536516
| -rw-r--r-- | www-client/firefox/firefox-35.0.ebuild | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/www-client/firefox/firefox-35.0.ebuild b/www-client/firefox/firefox-35.0.ebuild index 06e88a85..72b0e299 100644 --- a/www-client/firefox/firefox-35.0.ebuild +++ b/www-client/firefox/firefox-35.0.ebuild @@ -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 |