Skip to content

Commit caac940

Browse files
committed
scripts/bootstrap-prefix: remove automatic CPU_FLAGS_* setting
It doesn't do much, and turns the Prefix from generic to specific to the running machine, which is an undesirable side-effect. Closes: https://bugs.gentoo.org/939038 Signed-off-by: Fabian Groffen <[email protected]>
1 parent 715db69 commit caac940

File tree

1 file changed

+0
-41
lines changed

1 file changed

+0
-41
lines changed

scripts/bootstrap-prefix.sh

-41
Original file line numberDiff line numberDiff line change
@@ -2486,47 +2486,6 @@ bootstrap_stage3() {
24862486
# default USE-flags
24872487
unset USE
24882488

2489-
# do some sanity USE-flag enabling based on CPU, use cpuid2cpuflags
2490-
# if keyworded for this arg, else see if there's fallbacks to be
2491-
# made
2492-
mkdir -p "${ROOT}/etc/portage/package.use"
2493-
if emerge --color n --oneshot -v cpuid2cpuflags ; then
2494-
hash -r
2495-
echo "*/* $(cpuid2cpuflags)" \
2496-
> "${ROOT}/etc/portage/package.use/00cpu-flags"
2497-
else
2498-
case "${CHOST}" in
2499-
arm64-*darwin*)
2500-
# https://github.com/RustCrypto/utils/issues/378
2501-
local flags=( "aes" "sha1" "sha2" )
2502-
local line
2503-
sysctl hw.optional | while read -r line ; do
2504-
line=${line#hw.optional.}
2505-
[[ ${line%%*: } == "1" ]] || continue
2506-
line=${line%: *}
2507-
case "${line}" in
2508-
"neon")
2509-
flags+=( "${line}" )
2510-
;;
2511-
"armv8_"*)
2512-
line=${line#armv8_}
2513-
case "${line}" in
2514-
"crc32")
2515-
flags+=( "${line}" )
2516-
;;
2517-
"2_sha"*)
2518-
flags+=( "${line#2_}" )
2519-
;;
2520-
esac
2521-
;;
2522-
esac
2523-
done
2524-
echo "*/* CPU_FLAGS_ARM: ${flags}" \
2525-
> "${ROOT}/etc/portage/package.use/00cpu-flags"
2526-
;;
2527-
esac
2528-
fi
2529-
25302489
# re-emerge anything hopefully not running into circular deps
25312490
eflags=( "--deep" "--changed-use" "@world" )
25322491
einfo "running emerge ${eflags[*]}"

0 commit comments

Comments
 (0)