commit: f79e60287e93584c198227fe413cd9f042dea43f Author: Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com> AuthorDate: Thu Apr 28 09:25:42 2016 +0000 Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> CommitDate: Thu Apr 28 09:25:42 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f79e6028
bootstrap-prefix.sh: unset CFLAGS&co, not empty CFLAGS/CXXFLAGS in environment override profile values even if empty, breaking bootstrap of 32bit prefix on 64bit linux at least. scripts/bootstrap-prefix.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 172911e..f24baa9 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1127,13 +1127,16 @@ do_emerge_pkgs() { # # Avoid circular deps caused by the default profiles (and IUSE defaults). echo "USE=${myuse[*]} PKG=${pkg}" - PORTAGE_CONFIGROOT="${EPREFIX}" \ - PORTAGE_SYNC_STALE=0 \ - FEATURES="-news ${FEATURES}" \ - PYTHONPATH="${ROOT}"/tmp/usr/lib/portage/pym \ - USE="${myuse[*]}" \ - CFLAGS= CXXFLAGS= \ - emerge -v --oneshot --root-deps ${opts} "${pkg}" || return 1 + ( + unset CFLAGS CXXFLAGS + PORTAGE_CONFIGROOT="${EPREFIX}" \ + PORTAGE_SYNC_STALE=0 \ + FEATURES="-news ${FEATURES}" \ + PYTHONPATH="${ROOT}"/tmp/usr/lib/portage/pym \ + USE="${myuse[*]}" \ + emerge -v --oneshot --root-deps ${opts} "${pkg}" + ) + [[ $? -eq 0 ]] || return 1 done }