diff --git a/contrib/build-linux/appimage/make_appimage.sh b/contrib/build-linux/appimage/make_appimage.sh index a9173b232..6d3dca24d 100755 --- a/contrib/build-linux/appimage/make_appimage.sh +++ b/contrib/build-linux/appimage/make_appimage.sh @@ -76,12 +76,12 @@ info "installing python." ) -if [ -f "$DLL_TARGET_DIR/libsecp256k1.so.0" ]; then +if [ -f "$DLL_TARGET_DIR/libsecp256k1.so.1" ]; then info "libsecp256k1 already built, skipping" else "$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp" fi -cp -f "$DLL_TARGET_DIR/libsecp256k1.so.0" "$APPDIR/usr/lib/libsecp256k1.so.0" || fail "Could not copy libsecp to its destination" +cp -f "$DLL_TARGET_DIR"/libsecp256k1.so.* "$APPDIR/usr/lib/" || fail "Could not copy libsecp to its destination" # note: libxcb-util1 is not available in debian 10 (buster), only libxcb-util0. So we build it ourselves. diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec index dabb4524d..e62c38414 100644 --- a/contrib/build-wine/deterministic.spec +++ b/contrib/build-wine/deterministic.spec @@ -31,7 +31,7 @@ binaries = [] # Workaround for "Retro Look": binaries += [b for b in collect_dynamic_libs('PyQt5') if 'qwindowsvista' in b[0]] -binaries += [('C:/tmp/libsecp256k1-0.dll', '.')] +binaries += [('C:/tmp/libsecp256k1-1.dll', '.')] binaries += [('C:/tmp/libusb-1.0.dll', '.')] binaries += [('C:/tmp/libzbar-0.dll', '.')] diff --git a/contrib/build-wine/make_win.sh b/contrib/build-wine/make_win.sh index 92a712cc8..51ddaae54 100755 --- a/contrib/build-wine/make_win.sh +++ b/contrib/build-wine/make_win.sh @@ -41,7 +41,7 @@ rm "$here"/dist/* -rf mkdir -p "$CACHEDIR" "$DLL_TARGET_DIR" "$PIP_CACHE_DIR" -if [ -f "$DLL_TARGET_DIR/libsecp256k1-0.dll" ]; then +if [ -f "$DLL_TARGET_DIR/libsecp256k1-1.dll" ]; then info "libsecp256k1 already built, skipping" else "$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp" diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh index 5312cf77d..b8f24a435 100755 --- a/contrib/build-wine/prepare-wine.sh +++ b/contrib/build-wine/prepare-wine.sh @@ -53,7 +53,7 @@ $WINE_PYTHON -m pip install --no-build-isolation --no-dependencies --no-binary : # copy already built DLLs -cp "$DLL_TARGET_DIR/libsecp256k1-0.dll" $WINEPREFIX/drive_c/tmp/ || fail "Could not copy libsecp to its destination" +cp "$DLL_TARGET_DIR"/libsecp256k1-*.dll $WINEPREFIX/drive_c/tmp/ || fail "Could not copy libsecp to its destination" cp "$DLL_TARGET_DIR/libzbar-0.dll" $WINEPREFIX/drive_c/tmp/ || fail "Could not copy libzbar to its destination" cp "$DLL_TARGET_DIR/libusb-1.0.dll" $WINEPREFIX/drive_c/tmp/ || fail "Could not copy libusb to its destination" diff --git a/contrib/osx/make_osx.sh b/contrib/osx/make_osx.sh index 185efbdf9..af205c663 100755 --- a/contrib/osx/make_osx.sh +++ b/contrib/osx/make_osx.sh @@ -178,13 +178,13 @@ info "generating locale" ) || fail "failed generating locale" -if [ ! -f "$DLL_TARGET_DIR/libsecp256k1.0.dylib" ]; then +if [ ! -f "$DLL_TARGET_DIR/libsecp256k1.1.dylib" ]; then info "Building libsecp256k1 dylib..." "$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp" else info "Skipping libsecp256k1 build: reusing already built dylib." fi -cp -f "$DLL_TARGET_DIR/libsecp256k1.0.dylib" "$PROJECT_ROOT/electrum/" || fail "Could not copy libsecp256k1 dylib" +cp -f "$DLL_TARGET_DIR"/libsecp256k1.*.dylib "$PROJECT_ROOT/electrum/" || fail "Could not copy libsecp256k1 dylib" if [ ! -f "$DLL_TARGET_DIR/libzbar.0.dylib" ]; then info "Building ZBar dylib..." diff --git a/contrib/osx/osx.spec b/contrib/osx/osx.spec index 59f53ab99..7b983eea6 100644 --- a/contrib/osx/osx.spec +++ b/contrib/osx/osx.spec @@ -50,7 +50,7 @@ datas += collect_data_files('bitbox02') # Add libusb so Trezor and Safe-T mini will work binaries = [(electrum + "electrum/libusb-1.0.dylib", ".")] -binaries += [(electrum + "electrum/libsecp256k1.0.dylib", ".")] +binaries += [(electrum + "electrum/libsecp256k1.1.dylib", ".")] binaries += [(electrum + "electrum/libzbar.0.dylib", ".")] # Workaround for "Retro Look":