AaronFiore/electrum
1
0
Fork 0
Code Activity

build: update zbar to fix build issue with autoconf 2.70

Browse Source 
see https://github.com/Electron-Cash/Electron-Cash/pull/2143
see https://github.com/mchehab/zbar/issues/132
This commit is contained in:
SomberNight
2021-06-24 17:57:53 +02:00
parent 4380f68564
commit f1e77b6e43
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/build-linux/appimage/Dockerfile
View File

@@ -14,6 +14,7 @@ RUN apt-get update -q && \
autotools-dev=20150820.1 \ autotools-dev=20150820.1 \
autoconf=2.69-9 \ autoconf=2.69-9 \
libtool=2.4.6-0.1 \ libtool=2.4.6-0.1 \
autopoint=0.19.7-2ubuntu3.1 \
xz-utils=5.1.1alpha+20120614-2ubuntu2 \ xz-utils=5.1.1alpha+20120614-2ubuntu2 \
libssl-dev=1.0.2g-1ubuntu4.19 \ libssl-dev=1.0.2g-1ubuntu4.19 \
libssl1.0.0=1.0.2g-1ubuntu4.19 \ libssl1.0.0=1.0.2g-1ubuntu4.19 \

2
contrib/make_zbar.sh
View File

@@ -10,7 +10,7 @@
# Or for a Windows x86_64 (64-bit) target, run: # Or for a Windows x86_64 (64-bit) target, run:
# $ GCC_TRIPLET_HOST="x86_64-w64-mingw32" BUILD_TYPE="wine" ./contrib/make_zbar.sh # $ GCC_TRIPLET_HOST="x86_64-w64-mingw32" BUILD_TYPE="wine" ./contrib/make_zbar.sh
ZBAR_VERSION="d2893738411be897a04caa42ffc13d1f6107d3c6" ZBAR_VERSION="aac86d5f08d64ab4c3da78188eb622fa3cb07182"
set -e set -e

4
contrib/osx/make_osx
View File

@@ -122,8 +122,10 @@ cp "$BUILDDIR/libusb/1.0.23/lib/libusb-1.0.dylib" contrib/osx
echo "caea266f3fc3982adc55d6cb8d9bad10f6e61f0c24ce5901aa1804618e08e14d contrib/osx/libusb-1.0.dylib" | \ echo "caea266f3fc3982adc55d6cb8d9bad10f6e61f0c24ce5901aa1804618e08e14d contrib/osx/libusb-1.0.dylib" | \
shasum -a 256 -c || fail "libusb checksum mismatched" shasum -a 256 -c || fail "libusb checksum mismatched"
# install some build-time deps for compilation
brew install autoconf automake libtool gettext
info "Preparing for building libsecp256k1" info "Preparing for building libsecp256k1"
brew install autoconf automake libtool
"$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp" "$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp"
cp "$ROOT_FOLDER"/electrum/libsecp256k1.0.dylib contrib/osx cp "$ROOT_FOLDER"/electrum/libsecp256k1.0.dylib contrib/osx