AaronFiore/electrum
1
0
Fork 0
Code Activity

libsecp256k1: update hardcoded .so lib name in binaries (#8186)

Browse Source 
follow-up 7d83335e34
This commit is contained in:
ghost43
2023-02-04 01:36:19 +00:00
committed by GitHub
parent c66411f47e
commit 0eea47c78d
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.

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

@@ -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', '.')]

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

@@ -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"

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

@@ -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"

4
contrib/osx/make_osx.sh
View File

@@ -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..."

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
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":