Skip to content

Commit

Permalink
Remove arm64 hang workarounds.
Browse files Browse the repository at this point in the history
After msys2/msys2-runtime#234, we shouldn't hit msys2/msys2-autobuild#62
anymore, so remove the workarounds for it.  Also remove the sed for
enabling clangarm64 in pacman.conf, since it has been enabled by default
for a couple of years now.
  • Loading branch information
jeremyd2019 committed Nov 13, 2024
1 parent 853b0b6 commit ea565b8
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions msys2-runner-setup/setupscripts/setup.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,9 @@ IF [%MSYS2VERSION%]==[nightly] (
curl -Lo msys2-base-x86_64.sfx.exe "%MSYS2URL%"
"%TEMP%\msys2-base-x86_64.sfx.exe" -y -oC:\
CALL C:\msys64\msys2_shell.cmd -defterm -no-start -c "true"
REM https://github.com/msys2/msys2-autobuild/issues/62
CALL C:\msys64\msys2_shell.cmd -defterm -no-start -c "mkdir -p /etc/pacman.d/hooks && touch /etc/pacman.d/hooks/texinfo-{install,remove}.hook"
REM the caret is messing with CMD parsing, try it another way
C:\msys64\usr\bin\sed.exe -i -e 's/^^\(SigLevel\s\+=\s\+Required\)\s*$/\1 DatabaseNever/' /etc/pacman.conf
CALL C:\msys64\msys2_shell.cmd -defterm -no-start -c "pacman --noconfirm --overwrite '*' -Syuu && true"
CALL C:\msys64\msys2_shell.cmd -defterm -no-start -c "mv -f /etc/pacman.conf.pacnew /etc/pacman.conf"
REM the caret is messing with CMD parsing, try it another way
C:\msys64\usr\bin\sed.exe -i -e 's/^^\(SigLevel\s\+=\s\+Required\)\s*$/\1 DatabaseNever/' /etc/pacman.conf
CALL C:\msys64\msys2_shell.cmd -defterm -no-start -c "pacman --noconfirm --overwrite '*' -Syuu"
REM the caret is messing with CMD parsing, try it another way
C:\msys64\usr\bin\sed.exe -i -e '/^^# \[clangarm64\]/,/^^$/ s/^^# //g' /etc/pacman.conf
CALL C:\msys64\msys2_shell.cmd -defterm -no-start -c "pacman --noconfirm --overwrite '*' -Sy --needed base-devel mingw-w64-clang-aarch64-toolchain procps-ng psmisc vim etc-update"
CALL C:\msys64\msys2_shell.cmd -defterm -no-start -c "pacman --noconfirm -Scc"
CALL C:\msys64\msys2_shell.cmd -defterm -no-start -c "echo export EDITOR=vim >> ~/.bash_profile"
Expand Down

0 comments on commit ea565b8

Please sign in to comment.