diff options
| author |   Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> | 2016-04-28 11:25:42 +0200 |
|---|---|---|
| committer | Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> | 2016-04-28 11:25:42 +0200 |
| commit | f79e60287e93584c198227fe413cd9f042dea43f (patch) | |
| tree | 6cdc6311b5c8e1dc181c4bce2a09272640de70b0 | |
| parent | prefix-portage: bump ebuildshell patch, bug#155161 (diff) | |
| download | prefix-f79e6028.tar.gz prefix-f79e6028.tar.bz2 prefix-f79e6028.zip | |
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.
| -rwxr-xr-x | scripts/bootstrap-prefix.sh | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 172911ef1b..f24baa938f 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 } |