diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-11-21 08:00:19 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-11-21 08:00:19 +0000 |
commit | 6de98eae2671251cc32f1f9d3a23addfe36dc08a (patch) | |
tree | fa022e0ef850975c7ea3dd2ae37d03a7139d0d68 | |
parent | ff6f87572a496c0d7e969e4db16e7f755a954a74 (diff) | |
download | portage-6de98eae2671251cc32f1f9d3a23addfe36dc08a.tar.gz portage-6de98eae2671251cc32f1f9d3a23addfe36dc08a.tar.bz2 portage-6de98eae2671251cc32f1f9d3a23addfe36dc08a.zip |
Move environment saving from dyn_compile() to dyn_install()
so that state from src_install() is saved.
svn path=/main/trunk/; revision=8575
-rwxr-xr-x | bin/ebuild.sh | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 467554969..ee06c2f09 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -926,33 +926,6 @@ dyn_compile() { #|| abort_compile "fail" cd "${PORTAGE_BUILDDIR}" touch .compiled - cd build-info - - set -f - local f - for f in ASFLAGS CATEGORY CBUILD CC CFLAGS CHOST CTARGET CXX \ - CXXFLAGS DEPEND EXTRA_ECONF EXTRA_EINSTALL EXTRA_MAKE \ - FEATURES INHERITED IUSE LDFLAGS LIBCFLAGS LIBCXXFLAGS \ - LICENSE PDEPEND PF PKGUSE PROVIDE RDEPEND RESTRICT SLOT \ - KEYWORDS HOMEPAGE SRC_URI DESCRIPTION; do - [ -n "${!f}" ] && echo $(echo "${!f}" | tr '\n,\r,\t' ' , , ' | sed s/' \+'/' '/g) > ${f} - done - echo "${USE}" > USE - echo "${EAPI:-0}" > EAPI - set +f - - # local variables can leak into the saved environment. - unset f srcdir - save_ebuild_env > environment - bzip2 -f9 environment - - cp "${EBUILD}" "${PF}.ebuild" - [ -n "${PORTAGE_REPO_NAME}" ] && echo "${PORTAGE_REPO_NAME}" > repository - if hasq nostrip ${FEATURES} ${RESTRICT} || hasq strip ${RESTRICT} - then - touch DEBUGBUILD - fi - [ "$(type -t post_src_compile)" == "function" ] && qa_call post_src_compile trap SIGINT SIGQUIT @@ -1029,6 +1002,33 @@ dyn_install() { vecho cd ${PORTAGE_BUILDDIR} [ "$(type -t post_src_install)" == "function" ] && qa_call post_src_install + + cd "${PORTAGE_BUILDDIR}"/build-info + set -f + local f + for f in ASFLAGS CATEGORY CBUILD CC CFLAGS CHOST CTARGET CXX \ + CXXFLAGS DEPEND EXTRA_ECONF EXTRA_EINSTALL EXTRA_MAKE \ + FEATURES INHERITED IUSE LDFLAGS LIBCFLAGS LIBCXXFLAGS \ + LICENSE PDEPEND PF PKGUSE PROVIDE RDEPEND RESTRICT SLOT \ + KEYWORDS HOMEPAGE SRC_URI DESCRIPTION; do + [ -n "${!f}" ] && echo $(echo "${!f}" | \ + tr '\n,\r,\t' ' , , ' | sed s/' \+'/' '/g) > ${f} + done + echo "${USE}" > USE + echo "${EAPI:-0}" > EAPI + set +f + + # local variables can leak into the saved environment. + unset f + save_ebuild_env > environment + bzip2 -f9 environment + + cp "${EBUILD}" "${PF}.ebuild" + [ -n "${PORTAGE_REPO_NAME}" ] && echo "${PORTAGE_REPO_NAME}" > repository + if hasq nostrip ${FEATURES} ${RESTRICT} || hasq strip ${RESTRICT} + then + touch DEBUGBUILD + fi trap SIGINT SIGQUIT } |