| 1 |
commit: 3ccb4f2dbb793844e0c1e9c9b940ad46826269b7 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 30 10:42:52 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 30 10:42:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3ccb4f2d |
| 7 |
|
| 8 |
stage3: emerge system with default CFLAGS iso empty |
| 9 |
|
| 10 |
No reason to force C*FLAGS to empty values, just use the profile |
| 11 |
defaults, like we did with all packages leading up to this final emerge. |
| 12 |
|
| 13 |
Drop the GNUSTEP_BASE hack, it (hopefully is) obsolete by now. |
| 14 |
|
| 15 |
This fixes a problem with libtasn1 where gnulib uses inlined symbols |
| 16 |
that don't get inlined due to no optimisation in use (-O2 default from |
| 17 |
profile), which results in non-external objects which cannot be resolved |
| 18 |
by the linker eventually. So while this problem is a real one, using |
| 19 |
default CFLAGS fixes this (masks it, really), but this is a nice |
| 20 |
side-effect from cleaning this up. |
| 21 |
|
| 22 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 23 |
|
| 24 |
scripts/bootstrap-prefix.sh | 9 ++++----- |
| 25 |
1 file changed, 4 insertions(+), 5 deletions(-) |
| 26 |
|
| 27 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 28 |
index 58cf0a47e6..643d163211 100755 |
| 29 |
--- a/scripts/bootstrap-prefix.sh |
| 30 |
+++ b/scripts/bootstrap-prefix.sh |
| 31 |
@@ -2188,13 +2188,12 @@ bootstrap_stage3() { |
| 32 |
export USE="-git -crypt" |
| 33 |
|
| 34 |
# Portage should figure out itself what it needs to do, if anything. |
| 35 |
- # Avoid glib compiling for Cocoa libs if it finds them, since we're |
| 36 |
- # still with an old llvm that may not understand the system headers |
| 37 |
- # very well on Darwin (-DGNUSTEP_BASE_VERSION hack) |
| 38 |
einfo "running emerge -uDNv system" |
| 39 |
estatus "stage3: emerge -uDNv system" |
| 40 |
- CPPFLAGS="-DGNUSTEP_BASE_VERSION" \ |
| 41 |
- CFLAGS= CXXFLAGS= emerge --color n -uDNv system || return 1 |
| 42 |
+ ( |
| 43 |
+ unset CFLAGS CXXFLAGS CPPFLAGS |
| 44 |
+ emerge --color n -uDNv system |
| 45 |
+ ) || return 1 |
| 46 |
|
| 47 |
# remove anything that we don't need (compilers most likely) |
| 48 |
einfo "running emerge --depclean" |
Archives