From f1e77b6e43a27be45c6dc1dbfde33607d8125494 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Thu, 24 Jun 2021 17:57:53 +0200 Subject: [PATCH] build: update zbar to fix build issue with autoconf 2.70 see https://github.com/Electron-Cash/Electron-Cash/pull/2143 see https://github.com/mchehab/zbar/issues/132 --- contrib/build-linux/appimage/Dockerfile | 1 + contrib/make_zbar.sh | 2 +- contrib/osx/make_osx | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/build-linux/appimage/Dockerfile b/contrib/build-linux/appimage/Dockerfile index 1a59af60b..28a7e640b 100644 --- a/contrib/build-linux/appimage/Dockerfile +++ b/contrib/build-linux/appimage/Dockerfile @@ -14,6 +14,7 @@ RUN apt-get update -q && \ autotools-dev=20150820.1 \ autoconf=2.69-9 \ libtool=2.4.6-0.1 \ + autopoint=0.19.7-2ubuntu3.1 \ xz-utils=5.1.1alpha+20120614-2ubuntu2 \ libssl-dev=1.0.2g-1ubuntu4.19 \ libssl1.0.0=1.0.2g-1ubuntu4.19 \ diff --git a/contrib/make_zbar.sh b/contrib/make_zbar.sh index 5da032d6c..92f31a570 100755 --- a/contrib/make_zbar.sh +++ b/contrib/make_zbar.sh @@ -10,7 +10,7 @@ # Or for a Windows x86_64 (64-bit) target, run: # $ GCC_TRIPLET_HOST="x86_64-w64-mingw32" BUILD_TYPE="wine" ./contrib/make_zbar.sh -ZBAR_VERSION="d2893738411be897a04caa42ffc13d1f6107d3c6" +ZBAR_VERSION="aac86d5f08d64ab4c3da78188eb622fa3cb07182" set -e diff --git a/contrib/osx/make_osx b/contrib/osx/make_osx index 3ace02c97..ce09d9177 100755 --- a/contrib/osx/make_osx +++ b/contrib/osx/make_osx @@ -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" | \ 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" -brew install autoconf automake libtool "$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp" cp "$ROOT_FOLDER"/electrum/libsecp256k1.0.dylib contrib/osx