From f35437f03cdc61a23139849b8ad39991330739ae Mon Sep 17 00:00:00 2001 From: SomberNight Date: Mon, 7 Oct 2024 16:17:16 +0000 Subject: [PATCH] build: set ELECTRUM_ECC_DONT_COMPILE=1, instead manually build lib Haven't checked if electrum-ecc compiles libsecp reproducibly. For now let's just keep the old flow. (but if we spent time on making that compilation reproducible, the appimage and the macos builds could use it directly) --- contrib/build-linux/appimage/make_appimage.sh | 1 + contrib/build-wine/build-electrum-git.sh | 1 + contrib/make_packages.sh | 2 ++ contrib/osx/make_osx.sh | 1 + 4 files changed, 5 insertions(+) diff --git a/contrib/build-linux/appimage/make_appimage.sh b/contrib/build-linux/appimage/make_appimage.sh index 97de4aaa9..ff2fd0eea 100755 --- a/contrib/build-linux/appimage/make_appimage.sh +++ b/contrib/build-linux/appimage/make_appimage.sh @@ -161,6 +161,7 @@ info "Installing build dependencies." --cache-dir "$PIP_CACHE_DIR" -r "$CONTRIB/deterministic-build/requirements-build-appimage.txt" info "installing electrum and its dependencies." +export ELECTRUM_ECC_DONT_COMPILE=1 "$python" -m pip install --no-build-isolation --no-dependencies --no-binary :all: --no-warn-script-location \ --cache-dir "$PIP_CACHE_DIR" -r "$CONTRIB/deterministic-build/requirements.txt" "$python" -m pip install --no-build-isolation --no-dependencies --no-binary :all: --only-binary PyQt6,PyQt6-Qt6,cryptography --no-warn-script-location \ diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh index a1913ca3c..517d1a16d 100755 --- a/contrib/build-wine/build-electrum-git.sh +++ b/contrib/build-wine/build-electrum-git.sh @@ -32,6 +32,7 @@ export AIOHTTP_NO_EXTENSIONS=1 export YARL_NO_EXTENSIONS=1 export MULTIDICT_NO_EXTENSIONS=1 export FROZENLIST_NO_EXTENSIONS=1 +export ELECTRUM_ECC_DONT_COMPILE=1 info "Installing requirements..." $WINE_PYTHON -m pip install --no-build-isolation --no-dependencies --no-binary :all: --no-warn-script-location \ diff --git a/contrib/make_packages.sh b/contrib/make_packages.sh index f54a71780..6677245ed 100755 --- a/contrib/make_packages.sh +++ b/contrib/make_packages.sh @@ -32,6 +32,8 @@ export YARL_NO_EXTENSIONS=1 export MULTIDICT_NO_EXTENSIONS=1 export FROZENLIST_NO_EXTENSIONS=1 +export ELECTRUM_ECC_DONT_COMPILE=1 + # if we end up having to compile something, at least give reproducibility a fighting chance export LC_ALL=C export TZ=UTC diff --git a/contrib/osx/make_osx.sh b/contrib/osx/make_osx.sh index 6d7c3b838..f9a107e0d 100755 --- a/contrib/osx/make_osx.sh +++ b/contrib/osx/make_osx.sh @@ -169,6 +169,7 @@ cp -f "$DLL_TARGET_DIR/libusb-1.0.dylib" "$PROJECT_ROOT/electrum/" || fail "Coul info "Installing requirements..." +export ELECTRUM_ECC_DONT_COMPILE=1 python3 -m pip install --no-build-isolation --no-dependencies --no-binary :all: \ --no-warn-script-location \ -Ir ./contrib/deterministic-build/requirements.txt \