piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified Python pillow and lz4 installation thx to @raphaelcoeffic.

Browse Source
This commit is contained in:
rotorman
2022-06-12 13:27:34 +02:00
parent 5319648e04
commit d1f94afcce
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/setup_buildenv_msys2_stage2.sh
+3 -13
View File
@@ -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