* [gentoo-commits] portage r9595 - in main/branches/2.1.2: bin pym
@ 2008-03-29 5:55 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-03-29 5:55 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-03-29 05:55:49 +0000 (Sat, 29 Mar 2008)
New Revision: 9595
Modified:
main/branches/2.1.2/bin/misc-functions.sh
main/branches/2.1.2/pym/portage.py
Log:
Bug #214619 - Run dyn_package() and preinst_mask() from ${T} instead of
${D} in order to avoid leaving gmon.out files in ${D} in case any tools
were built with -pf in CFLAGS. Also, call preinst_mask() after all other
functions so that INSTALL_MASK can be used to wipe out any gmon.out files
created during previous functions. (trunk r9592)
Modified: main/branches/2.1.2/bin/misc-functions.sh
===================================================================
--- main/branches/2.1.2/bin/misc-functions.sh 2008-03-29 05:53:07 UTC (rev 9594)
+++ main/branches/2.1.2/bin/misc-functions.sh 2008-03-29 05:55:49 UTC (rev 9595)
@@ -407,6 +407,11 @@
eerror "${FUNCNAME}: D is unset"
return 1
fi
+
+ # Make sure $PWD is not ${D} so that we don't leave gmon.out files
+ # in there in case any tools were built with -pg in CFLAGS.
+ cd "${T}"
+
# remove man pages, info pages, docs if requested
for f in man info doc; do
if hasq no${f} $FEATURES; then
@@ -525,7 +530,9 @@
}
dyn_package() {
- cd "${PORTAGE_BUILDDIR}/image"
+ # Make sure $PWD is not ${D} so that we don't leave gmon.out files
+ # in there in case any tools were built with -pg in CFLAGS.
+ cd "${T}"
install_mask "${PORTAGE_BUILDDIR}/image" "${PKG_INSTALL_MASK}"
local pkg_dest="${PKGDIR}/All/${PF}.tbz2"
local pkg_tmp="${PKGDIR}/All/${PF}.tbz2.$$"
@@ -534,10 +541,9 @@
# Sandbox is disabled in case the user wants to use a symlink
# for $PKGDIR and/or $PKGDIR/All.
export SANDBOX_ON="0"
- tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS . | \
+ tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${D}" . | \
bzip2 -f > "${pkg_tmp}" || \
die "Failed to create tarball"
- cd ..
export PYTHONPATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
python -c "import xpak; t=xpak.tbz2('${pkg_tmp}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')"
if [ $? -ne 0 ]; then
Modified: main/branches/2.1.2/pym/portage.py
===================================================================
--- main/branches/2.1.2/pym/portage.py 2008-03-29 05:53:07 UTC (rev 9594)
+++ main/branches/2.1.2/pym/portage.py 2008-03-29 05:55:49 UTC (rev 9595)
@@ -4678,11 +4678,14 @@
phase_retval = exit_status_check(phase_retval)
if phase_retval == os.EX_OK:
# Post phase logic and tasks that have been factored out of
- # ebuild.sh.
+ # ebuild.sh. Call preinst_mask last so that INSTALL_MASK can
+ # can be used to wipe out any gmon.out files created during
+ # previous functions (in case any tools were built with -pg
+ # in CFLAGS).
myargs = [_shell_quote(misc_sh_binary),
- "preinst_bsdflags", "preinst_mask",
+ "preinst_bsdflags",
"preinst_sfperms", "preinst_selinux_labels",
- "preinst_suid_scan"]
+ "preinst_suid_scan", "preinst_mask"]
_doebuild_exit_status_unlink(
mysettings.get("EBUILD_EXIT_STATUS_FILE"))
mysettings["EBUILD_PHASE"] = ""
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-03-29 5:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-29 5:55 [gentoo-commits] portage r9595 - in main/branches/2.1.2: bin pym Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox