From cb2f92f710b780a03ea755172c8a228cb0bb2c0a Mon Sep 17 00:00:00 2001 From: SomberNight Date: Mon, 7 Sep 2020 18:18:58 +0200 Subject: [PATCH] windows binaries: update pyinstaller to 4.0 --- contrib/build-wine/prepare-wine.sh | 6 +++--- contrib/requirements/requirements-mac-build.txt | 2 +- contrib/requirements/requirements-wine-build.txt | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh index 2f9f19581..b69c8122a 100755 --- a/contrib/build-wine/prepare-wine.sh +++ b/contrib/build-wine/prepare-wine.sh @@ -14,8 +14,8 @@ LIBUSB_COMMIT="e782eeb2514266f6738e242cdcb18e3ae1ed06fa" # ^ tag v1.0.23 PYINSTALLER_REPO="https://github.com/SomberNight/pyinstaller.git" -PYINSTALLER_COMMIT="e934539374e30d1500fcdbe8e4eb0860413935b2" -# ^ tag 3.6, plus a custom commit that fixes cross-compilation with MinGW +PYINSTALLER_COMMIT="6e455b2c1208465742484436009bfb1e1baf2e01" +# ^ tag 4.0, plus a custom commit that fixes cross-compilation with MinGW PYTHON_VERSION=3.7.9 @@ -126,7 +126,7 @@ info "Building PyInstaller." echo "const char *electrum_tag = \"tagged by Electrum@$ELECTRUM_COMMIT_HASH\";" >> ./bootloader/src/pyi_main.c pushd bootloader # cross-compile to Windows using host python - python3 ./waf all CC=i686-w64-mingw32-gcc CFLAGS="-static -Wno-dangling-else -Wno-error=unused-value" + python3 ./waf all CC=i686-w64-mingw32-gcc CFLAGS="-static -Wno-dangling-else -Wno-error=unused-value -Wno-error=implicit-function-declaration" popd # sanity check bootloader is there: [[ -e PyInstaller/bootloader/Windows-32bit/runw.exe ]] || fail "Could not find runw.exe in target dir!" diff --git a/contrib/requirements/requirements-mac-build.txt b/contrib/requirements/requirements-mac-build.txt index d268ae4ee..e00d5b5b7 100644 --- a/contrib/requirements/requirements-mac-build.txt +++ b/contrib/requirements/requirements-mac-build.txt @@ -1,5 +1,5 @@ pip -setuptools +setuptools<50.0.0 # 50.0.0 might break pyinstaller. see https://github.com/pyinstaller/pyinstaller/commit/e9f9d79d6b23c767512156323d0a5d28c6386a57 pyinstaller>=3.6 # needed by pyinstaller: diff --git a/contrib/requirements/requirements-wine-build.txt b/contrib/requirements/requirements-wine-build.txt index 07357058f..d56f4a309 100644 --- a/contrib/requirements/requirements-wine-build.txt +++ b/contrib/requirements/requirements-wine-build.txt @@ -1,7 +1,8 @@ pip -setuptools +setuptools<50.0.0 # 50.0.0 might break pyinstaller. see https://github.com/pyinstaller/pyinstaller/commit/e9f9d79d6b23c767512156323d0a5d28c6386a57 # needed by pyinstaller: pefile>=2017.8.1 altgraph pywin32-ctypes>=0.2.0 +pyinstaller-hooks-contrib>=2020.6