[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     824fd17a4b55d2fd53da24228bbd1ffefa6cf97c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 18:18:51 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 10 18:18:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=824fd17a

scripts/bootstrap-prefix: fix bootstrapping glib, bug #582104

 scripts/bootstrap-prefix.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 074276d..ad4de47 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1396,7 +1396,11 @@ bootstrap_stage3() {
        # temporarily work around c_rehash missing openssl dependency, bug 
#572790
        CFLAGS= CXXFLAGS= emerge -1 openssl || return 1
 
-       # Portage should figure out itself what it needs to do, if anything
+       # Portage should figure out itself what it needs to do, if anything.
+       # Avoid glib compiling for Cocoa libs if it finds them, since we're
+       # still with an old llvm that may not understand the system headers
+       # very well on Darwin (-DGNUSTEP_BASE_VERSION hack)
+       CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
        CFLAGS= CXXFLAGS= USE="-git" emerge -u system || return 1
 
        # remove anything that we don't need (compilers most likely)