diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2024-08-20 20:54:36 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2024-08-20 20:54:36 +0200 |
| commit | e3ce0dbb0170eb5d3c3e88f7b5d4e304cd62bb48 (patch) | |
| tree | e5277fd0c3920df2e3bbef81582cc08d2c49f8d6 | |
| parent | scripts/bootstrap-prefix: drop bits that assume we don't have a C++ compiler (diff) | |
| download | prefix-e3ce0dbb0170eb5d3c3e88f7b5d4e304cd62bb48.tar.gz prefix-e3ce0dbb0170eb5d3c3e88f7b5d4e304cd62bb48.tar.bz2 prefix-e3ce0dbb0170eb5d3c3e88f7b5d4e304cd62bb48.zip | |
scripts/bootstrap-prefix: first complete @system before using USE-flags
Complete @system before trying to set default USE-flags.
This may cause re-compilations but is necessary to avoid circular deps
e.g. with curl, so take the extra step, much like how in the past we
would emerge -e @world after @system.
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
| -rwxr-xr-x | scripts/bootstrap-prefix.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index b4e8f75841..d12440fd8c 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -2451,7 +2451,7 @@ bootstrap_stage3() { export USE="${DISABLE_USE[*]}" # Portage should figure out itself what it needs to do, if anything. - local eflags=( "--deep" "--update" "--changed-use" "@system" ) + local eflags=( "@system" ) einfo "running emerge ${eflags[*]}" estatus "stage3: emerge ${eflags[*]}" emerge --color n -v "${eflags[@]}" || return 1 @@ -2461,6 +2461,16 @@ bootstrap_stage3() { # from happening, add to the worldfile #936629#c5 emerge --color n --noreplace sys-devel/binutils + # now try and get things in the way they should be according to the + # default USE-flags + unset USE + + # Portage should figure out itself what it needs to do, if anything. + eflags=( "--deep" "--update" "--changed-use" "@world" ) + einfo "running emerge ${eflags[*]}" + estatus "stage3: emerge ${eflags[*]}" + emerge --color n -v "${eflags[@]}" || return 1 + # Remove anything that we don't need (compilers most likely) einfo "running emerge --depclean" estatus "stage3: emerge --depclean" |