From 204a84d8d90ba385898b5bd679fb52f5dd76d236 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 28 Apr 2012 17:33:07 +0100 Subject: [PATCH] ebuild.sh: source /etc/portage/env scripts before /etc/portage/bashrc --- bin/ebuild.sh | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index b1d1df1..173865c 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -375,7 +375,19 @@ source_all_bashrcs() { for x in "${path_array[@]}" ; do [ -f "$x/profile.bashrc" ] && qa_source "$x/profile.bashrc" done + fi + + if [ -r "${PORTAGE_BASHRC}" ] ; then + if [ "$PORTAGE_DEBUG" != "1" ] || [ "${-/x/}" != "$-" ]; then + source "${PORTAGE_BASHRC}" + else + set -x + source "${PORTAGE_BASHRC}" + set +x + fi + fi + if [[ $EBUILD_PHASE != depend ]] ; then # The user's bashrc is the ONLY non-portage bit of code that can # change shopts without a QA violation. for x in "${PM_EBUILD_HOOK_DIR}"/${CATEGORY}/{${PN},${PN}:${SLOT},${P},${PF}}; do @@ -394,16 +406,6 @@ source_all_bashrcs() { done fi - if [ -r "${PORTAGE_BASHRC}" ] ; then - if [ "$PORTAGE_DEBUG" != "1" ] || [ "${-/x/}" != "$-" ]; then - source "${PORTAGE_BASHRC}" - else - set -x - source "${PORTAGE_BASHRC}" - set +x - fi - fi - [ ! -z "${OCC}" ] && export CC="${OCC}" [ ! -z "${OCXX}" ] && export CXX="${OCXX}" } -- 1.7.8.5