From a143d05fb9e5584cac64038dc0c243adad59b557 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Mon, 29 Aug 2022 15:12:54 +0000 Subject: [PATCH] mac build: bump pyinstaller (4.2 -> 5.3) --- contrib/osx/README.md | 3 +++ contrib/osx/make_osx | 5 ++--- contrib/osx/osx.spec | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/osx/README.md b/contrib/osx/README.md index 6aee2b694..204ef2f35 100644 --- a/contrib/osx/README.md +++ b/contrib/osx/README.md @@ -11,6 +11,9 @@ This guide explains how to build Electrum binaries for macOS systems. This needs to be done on a system running macOS or OS X. +The script is only tested on Intel-based Macs, and the binary built +targets `x86_64` currently. + Notes about compatibility with different macOS versions: - In general the binary is not guaranteed to run on an older version of macOS than what the build machine has. This is due to bundling the compiled Python into diff --git a/contrib/osx/make_osx b/contrib/osx/make_osx index afe115f53..d4b17ef01 100755 --- a/contrib/osx/make_osx +++ b/contrib/osx/make_osx @@ -108,8 +108,8 @@ brew install autoconf automake libtool gettext coreutils pkgconfig info "Building PyInstaller." PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git" -PYINSTALLER_COMMIT="40c9abce2d8de879e414fd377c933dccaab1e156" -# ^ tag "4.2" +PYINSTALLER_COMMIT="fbf7948be85177dd44b41217e9f039e1d176de6b" +# ^ tag "5.3" # TODO test newer versions of pyinstaller for build-reproducibility. # we are using this version for now due to change in code-signing behaviour # (https://github.com/pyinstaller/pyinstaller/pull/5581) @@ -139,7 +139,6 @@ PYINSTALLER_COMMIT="40c9abce2d8de879e414fd377c933dccaab1e156" popd # sanity check bootloader is there: [[ -e "PyInstaller/bootloader/Darwin-64bit/runw" ]] || fail "Could not find runw in target dir!" - rm pyinstaller.py # workaround for https://github.com/pyinstaller/pyinstaller/pull/6701 ) || fail "PyInstaller build failed" info "Installing PyInstaller." python3 -m pip install --no-build-isolation --no-dependencies --no-warn-script-location "$CACHEDIR/pyinstaller" diff --git a/contrib/osx/osx.spec b/contrib/osx/osx.spec index db1d976b5..6f40909f2 100644 --- a/contrib/osx/osx.spec +++ b/contrib/osx/osx.spec @@ -107,6 +107,7 @@ exe = EXE( upx=True, icon=electrum+ICONS_FILE, console=False, + target_arch='x86_64', # TODO investigate building 'universal2' ) app = BUNDLE(