Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport btc lib upgrades #409

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Backport btc lib upgrades #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8b8eb89
upgrade boost
eugene-sy Jun 11, 2019
a83a3f6
zlib update
eugene-sy Jun 12, 2019
bc58cc0
apply zmq patches
eugene-sy Jun 12, 2019
077d54a
zmq and x-stuff
eugene-sy Jun 12, 2019
ce59606
oppenssl protobuf and qrencode
eugene-sy Jun 12, 2019
dc65c50
some misc libs, pt 1
eugene-sy Jun 12, 2019
c076c4c
some misc libs, pt 2
eugene-sy Jun 13, 2019
4549324
build system changes
eugene-sy Jun 13, 2019
31317a8
qt upgrade
eugene-sy Jun 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/bin/sh
# Copyright (c) 2013-2016 The Bitcoin Core developers
# Copyright (c) 2017-2019 The Merit Foundation
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.

export LC_ALL=C
set -e
srcdir="$(dirname $0)"
cd "$srcdir"
Expand Down
253 changes: 131 additions & 122 deletions build-aux/m4/ax_boost_base.m4
View file
Open in desktop

Large diffs are not rendered by default.

236 changes: 194 additions & 42 deletions configure.ac
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions depends/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ i686*
mips*
arm*
aarch64*
riscv32*
riscv64*
18 changes: 9 additions & 9 deletions depends/builders/darwin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
build_darwin_CC: = $(shell xcrun -f clang)
build_darwin_CXX: = $(shell xcrun -f clang++)
build_darwin_AR: = $(shell xcrun -f ar)
build_darwin_RANLIB: = $(shell xcrun -f ranlib)
build_darwin_STRIP: = $(shell xcrun -f strip)
build_darwin_OTOOL: = $(shell xcrun -f otool)
build_darwin_NM: = $(shell xcrun -f nm)
build_darwin_CC:=$(shell xcrun -f clang)
build_darwin_CXX:=$(shell xcrun -f clang++)
build_darwin_AR:=$(shell xcrun -f ar)
build_darwin_RANLIB:=$(shell xcrun -f ranlib)
build_darwin_STRIP:=$(shell xcrun -f strip)
build_darwin_OTOOL:=$(shell xcrun -f otool)
build_darwin_NM:=$(shell xcrun -f nm)
build_darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool)
build_darwin_SHA256SUM = shasum -a 256
build_darwin_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o
build_darwin_SHA256SUM=shasum -a 256
build_darwin_DOWNLOAD=curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o

#darwin host on darwin builder. overrides darwin host preferences.
darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION)
Expand Down
Loading