axs 14/12/05 23:06:43 Modified: firefox-34.0.5-r1.ebuild ChangeLog Log: shorten objdir to support longer PORTAGE_TMPDIRs, bug 531696 (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Revision Changes Path 1.2 www-client/firefox/firefox-34.0.5-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/firefox-34.0.5-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/firefox-34.0.5-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/firefox-34.0.5-r1.ebuild?r1=1.1&r2=1.2 Index: firefox-34.0.5-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-34.0.5-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- firefox-34.0.5-r1.ebuild 4 Dec 2014 08:53:07 -0000 1.1 +++ firefox-34.0.5-r1.ebuild 5 Dec 2014 23:06:43 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-34.0.5-r1.ebuild,v 1.1 2014/12/04 08:53:07 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-34.0.5-r1.ebuild,v 1.2 2014/12/05 23:06:43 axs Exp $ EAPI="5" VIRTUALX_REQUIRED="pgo" @@ -89,6 +89,8 @@ QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox" +BUILD_OBJ_DIR="${S}/ff" + pkg_setup() { moz_pkgsetup @@ -225,6 +227,8 @@ 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 @@ -274,33 +278,30 @@ 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 1.370 www-client/firefox/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/ChangeLog?rev=1.370&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/ChangeLog?rev=1.370&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/ChangeLog?r1=1.369&r2=1.370 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v retrieving revision 1.369 retrieving revision 1.370 diff -u -r1.369 -r1.370 --- ChangeLog 4 Dec 2014 08:53:07 -0000 1.369 +++ ChangeLog 5 Dec 2014 23:06:43 -0000 1.370 @@ -1,6 +1,10 @@ # ChangeLog for www-client/firefox # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.369 2014/12/04 08:53:07 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.370 2014/12/05 23:06:43 axs Exp $ + + 05 Dec 2014; Ian Stakenvicius (_AxS_) <[email protected]> + firefox-34.0.5-r1.ebuild: + shorten objdir to support longer PORTAGE_TMPDIRs, bug 531696 *firefox-34.0.5-r1 (04 Dec 2014)
