From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 91818158086 for ; Thu, 30 Dec 2021 10:46:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BDA812BC073; Thu, 30 Dec 2021 10:46:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F2E012BC073 for ; Thu, 30 Dec 2021 10:46:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB0EE342BBF for ; Thu, 30 Dec 2021 10:46:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58172219 for ; Thu, 30 Dec 2021 10:46:48 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1640860972.3ccb4f2dbb793844e0c1e9c9b940ad46826269b7.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 3ccb4f2dbb793844e0c1e9c9b940ad46826269b7 X-VCS-Branch: master Date: Thu, 30 Dec 2021 10:46:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 37077171-38fb-4536-ab3d-65ae5a06b210 X-Archives-Hash: 3354602089b13f55b0f2b6e867d6f888 commit: 3ccb4f2dbb793844e0c1e9c9b940ad46826269b7 Author: Fabian Groffen gentoo org> AuthorDate: Thu Dec 30 10:42:52 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Dec 30 10:42:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3ccb4f2d stage3: emerge system with default CFLAGS iso empty No reason to force C*FLAGS to empty values, just use the profile defaults, like we did with all packages leading up to this final emerge. Drop the GNUSTEP_BASE hack, it (hopefully is) obsolete by now. This fixes a problem with libtasn1 where gnulib uses inlined symbols that don't get inlined due to no optimisation in use (-O2 default from profile), which results in non-external objects which cannot be resolved by the linker eventually. So while this problem is a real one, using default CFLAGS fixes this (masks it, really), but this is a nice side-effect from cleaning this up. Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 58cf0a47e6..643d163211 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -2188,13 +2188,12 @@ bootstrap_stage3() { export USE="-git -crypt" # 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) einfo "running emerge -uDNv system" estatus "stage3: emerge -uDNv system" - CPPFLAGS="-DGNUSTEP_BASE_VERSION" \ - CFLAGS= CXXFLAGS= emerge --color n -uDNv system || return 1 + ( + unset CFLAGS CXXFLAGS CPPFLAGS + emerge --color n -uDNv system + ) || return 1 # remove anything that we don't need (compilers most likely) einfo "running emerge --depclean"