AaronFiore/electrum
1
0
Fork 0
Code Activity

libsecp256k1: update hardcoded .so lib name in binaries

Browse Source 
follow-up 2a2b683d23

TODO: maybe we should drop the version number in the lib name we bundle...
This commit is contained in:
SomberNight
2023-04-21 14:42:51 +00:00
parent 2f8ab8027b
commit cede16a522
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/build-linux/appimage/make_appimage.sh
View File

@@ -78,7 +78,7 @@ info "installing python."
) )
if [ -f "$DLL_TARGET_DIR/libsecp256k1.so.1" ]; then if [ -f "$DLL_TARGET_DIR/libsecp256k1.so.2" ]; then
info "libsecp256k1 already built, skipping" info "libsecp256k1 already built, skipping"
else else
"$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp" "$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp"

2
contrib/build-wine/deterministic.spec
View File

@@ -31,7 +31,7 @@ binaries = []
# Workaround for "Retro Look": # Workaround for "Retro Look":
binaries += [b for b in collect_dynamic_libs('PyQt5') if 'qwindowsvista' in b[0]] binaries += [b for b in collect_dynamic_libs('PyQt5') if 'qwindowsvista' in b[0]]
binaries += [('C:/tmp/libsecp256k1-1.dll', '.')] binaries += [('C:/tmp/libsecp256k1-2.dll', '.')]
binaries += [('C:/tmp/libusb-1.0.dll', '.')] binaries += [('C:/tmp/libusb-1.0.dll', '.')]
binaries += [('C:/tmp/libzbar-0.dll', '.')] binaries += [('C:/tmp/libzbar-0.dll', '.')]

2
contrib/build-wine/make_win.sh
View File

@@ -43,7 +43,7 @@ rm "$here"/dist/* -rf
mkdir -p "$CACHEDIR" "$DLL_TARGET_DIR" "$PIP_CACHE_DIR" mkdir -p "$CACHEDIR" "$DLL_TARGET_DIR" "$PIP_CACHE_DIR"
if [ -f "$DLL_TARGET_DIR/libsecp256k1-1.dll" ]; then if [ -f "$DLL_TARGET_DIR/libsecp256k1-2.dll" ]; then
info "libsecp256k1 already built, skipping" info "libsecp256k1 already built, skipping"
else else
"$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp" "$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp"

2
contrib/osx/make_osx.sh
View File

@@ -180,7 +180,7 @@ info "generating locale"
) || fail "failed generating locale" ) || fail "failed generating locale"
if [ ! -f "$DLL_TARGET_DIR/libsecp256k1.1.dylib" ]; then if [ ! -f "$DLL_TARGET_DIR/libsecp256k1.2.dylib" ]; then
info "Building libsecp256k1 dylib..." info "Building libsecp256k1 dylib..."
"$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp" "$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp"
else else

2
contrib/osx/osx.spec
View File

@@ -50,7 +50,7 @@ datas += collect_data_files('bitbox02')
# Add libusb so Trezor and Safe-T mini will work # Add libusb so Trezor and Safe-T mini will work
binaries = [(electrum + "electrum/libusb-1.0.dylib", ".")] binaries = [(electrum + "electrum/libusb-1.0.dylib", ".")]
binaries += [(electrum + "electrum/libsecp256k1.1.dylib", ".")] binaries += [(electrum + "electrum/libsecp256k1.2.dylib", ".")]
binaries += [(electrum + "electrum/libzbar.0.dylib", ".")] binaries += [(electrum + "electrum/libzbar.0.dylib", ".")]
# Workaround for "Retro Look": # Workaround for "Retro Look":