From d1f94afcce244bca2bcdd4e85ad1c5f90c0b6f7a Mon Sep 17 00:00:00 2001 From: rotorman Date: Sun, 12 Jun 2022 13:27:34 +0200 Subject: [PATCH] Simplified Python pillow and lz4 installation thx to @raphaelcoeffic. --- tools/setup_buildenv_msys2_stage2.sh | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/tools/setup_buildenv_msys2_stage2.sh b/tools/setup_buildenv_msys2_stage2.sh index 8d064a975..46f44ef3f 100644 --- a/tools/setup_buildenv_msys2_stage2.sh +++ b/tools/setup_buildenv_msys2_stage2.sh @@ -14,14 +14,14 @@ do done echo "=== Step $((STEP++)): Installing packages ===" -pacman -S --noconfirm mingw-w64-x86_64-cmake mingw-w64-x86_64-python-pip mingw-w64-x86_64-arm-none-eabi-gcc mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-zlib mingw-w64-x86_64-libtiff mingw-w64-x86_64-freetype mingw-w64-x86_64-lcms2 mingw-w64-x86_64-libwebp mingw-w64-x86_64-openjpeg2 mingw-w64-x86_64-libimagequant mingw-w64-x86_64-libraqm mingw-w64-x86_64-SDL mingw-w64-x86_64-nsis mingw-w64-x86_64-clang +pacman -S --noconfirm mingw-w64-x86_64-cmake mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-pillow mingw-w64-x86_64-python-lz4 mingw-w64-x86_64-arm-none-eabi-gcc mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-zlib mingw-w64-x86_64-libtiff mingw-w64-x86_64-freetype mingw-w64-x86_64-lcms2 mingw-w64-x86_64-libwebp mingw-w64-x86_64-openjpeg2 mingw-w64-x86_64-libimagequant mingw-w64-x86_64-libraqm mingw-w64-x86_64-SDL mingw-w64-x86_64-nsis mingw-w64-x86_64-clang if [[ $PAUSEAFTEREACHLINE == "true" ]]; then echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." read fi -echo "=== Step $((STEP++)): Installing Python Pillow and clang ===" -pip install Pillow clang +echo "=== Step $((STEP++)): Installing Python clang ===" +python -m pip install clang if [[ $PAUSEAFTEREACHLINE == "true" ]]; then echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." read @@ -68,16 +68,6 @@ if [[ $PAUSEAFTEREACHLINE == "true" ]]; then read fi -echo "=== Step $((STEP++)): Fetching and installing Python package lz4 ===" -git clone --recursive https://github.com/python-lz4/python-lz4.git -cd python-lz4 -python setup.py install -cd .. -if [[ $PAUSEAFTEREACHLINE == "true" ]]; then - echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." - read -fi - echo "=== Step $((STEP++)): Installing Qt build environment ===" python -m aqt install 5.12.9 windows desktop win64_mingw73 if [[ $PAUSEAFTEREACHLINE == "true" ]]; then