diff options
| author | Artem Dyomin <artem.dyomin@qt.io> | 2022-11-21 14:02:43 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-11-28 10:14:04 +0000 |
| commit | e0b122e42f41ac56e3641633a77e3c2662bb1150 (patch) | |
| tree | a5ebd3c89c9bedef03c3848a9023b1a621c81b86 | |
| parent | ef15c16528b7822a3facf91ab31f101ea0e6eb11 (diff) | |
| download | qt5-e0b122e42f41ac56e3641633a77e3c2662bb1150.tar.gz | |
Add diffutils to msys2
cmp command is used by ffmpeg ./configure
Change-Id: If80664d6c3318b7605c69d50e7606a1ec10840ea
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 817a6d07f8a683d7d387d565bc6279f9d6c1be5f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin/provisioning/common/windows/install-msys2.ps1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index f3034ce6..825b21a1 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -71,7 +71,7 @@ if ((Test-Path $url_cache_prebuilt)) { # install perl make and yasm # Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file. - cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman-key --refresh;pacman -S --noconfirm perl make yasm`"" + cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman-key --refresh;pacman -S --noconfirm perl make yasm diffutils`"" Start-Sleep -s 60 cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`"" |