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