Skip to content

Commit e1d17ca

Browse files
CryptoDragonLadyCryptoDragonLady
committed
test
1 parent 4cef91a commit e1d17ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1678
-1514
lines changed

‎.travis.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ env:
4343
RUN_TESTS=false GOAL="deploy" BITCOIN_CONFIG="--disable-gui-tests --disable-bench --enable-reduce-exports --disable-zmq --enable-gui --with-gui=auto LDFLAGS=-static-libstdc++" BDB_INCLUDE_PATH="/usr/include" BDB_LIB_PATH="/usr/lib"
4444
- HOST=x86_64-w64-mingw32 PPA="ppa:bitcoin/bitcoin" DEP_OPTS="" PACKAGES="g++-multilib python3 python3-dev python3-pip nsis bc faketime wine1.6 bc build-essential libc6-dev libtool autotools-dev automake cmake pkg-config bsdmainutils imagemagick libqt4-dev qt4-dev-tools libqt4-dev-bin libqt4-opengl-dev libqtwebkit-dev qt4-linguist-tools libminiupnpc-dev curl g++-mingw-w64-x86-64 mingw-w64-x86-64-dev g++-mingw-w64-i686 mingw-w64-i686-dev libevent-dev libboost-system-dev libboost-filesystem-dev libminiupnpc-dev libprotobuf-dev protobuf-compiler libqrencode-dev flex libelf-dev libdwarf-dev ttf-mscorefonts-installer ttf-mscorefonts-installer nsis-pluginapi libdb4.8++ libdb4.8 libdb4.8-dev db4.8-util libdb4.8++-dev firebird-dev libegl1-mesa-dev libpq-dev libsqlite3-dev unixodbc-dev"
4545
RUN_TESTS=false GOAL="deploy" BITCOIN_CONFIG="--disable-gui-tests --disable-bench --enable-reduce-exports --disable-zmq --enable-gui --with-gui=auto LDFLAGS=-static-libstdc++" BDB_INCLUDE_PATH="/usr/include" BDB_LIB_PATH="/usr/lib"
46-
- HOST=i686-w64-mingw32 PPA="ppa:bitcoin/bitcoin" DEP_OPTS="" PACKAGES="g++-multilib python3 python3-dev python3-pip nsis bc faketime wine1.6 bc build-essential libc6-dev libtool autotools-dev automake cmake pkg-config bsdmainutils imagemagick libqt4-dev qt4-dev-tools libqt4-dev-bin libqt4-opengl-dev libqtwebkit-dev qt4-linguist-tools libminiupnpc-dev curl g++-mingw-w64-x86-64 mingw-w64-x86-64-dev g++-mingw-w64-i686 mingw-w64-i686-dev libevent-dev libboost-system-dev libboost-filesystem-dev libminiupnpc-dev libprotobuf-dev protobuf-compiler libqrencode-dev flex libelf-dev libdwarf-dev ttf-mscorefonts-installer ttf-mscorefonts-installer nsis-pluginapi libdb4.8++ libdb4.8 libdb4.8-dev db4.8-util libdb4.8++-dev firebird-dev libegl1-mesa-dev libpq-dev libsqlite3-dev unixodbc-dev"
47-
RUN_TESTS=false GOAL="deploy" BITCOIN_CONFIG="--disable-gui-tests --disable-bench --enable-reduce-exports --disable-zmq --enable-gui --with-gui=auto LDFLAGS=-static-libstdc++" BDB_INCLUDE_PATH="/usr/include" BDB_LIB_PATH="/usr/lib"
48-
- HOST=x86_64-w64-mingw32 PPA="ppa:bitcoin/bitcoin" DEP_OPTS="" PACKAGES="g++-multilib python3 python3-dev python3-pip nsis bc faketime wine1.6 bc build-essential libc6-dev libtool autotools-dev automake cmake pkg-config bsdmainutils imagemagick libqt4-dev qt4-dev-tools libqt4-dev-bin libqt4-opengl-dev libqtwebkit-dev qt4-linguist-tools libminiupnpc-dev curl g++-mingw-w64-x86-64 mingw-w64-x86-64-dev g++-mingw-w64-i686 mingw-w64-i686-dev libevent-dev libboost-system-dev libboost-filesystem-dev libminiupnpc-dev libprotobuf-dev protobuf-compiler libqrencode-dev flex libelf-dev libdwarf-dev ttf-mscorefonts-installer ttf-mscorefonts-installer nsis-pluginapi libdb4.8++ libdb4.8 libdb4.8-dev db4.8-util libdb4.8++-dev firebird-dev libegl1-mesa-dev libpq-dev libsqlite3-dev unixodbc-dev"
49-
RUN_TESTS=false GOAL="deploy" BITCOIN_CONFIG="--disable-gui-tests --disable-bench --enable-reduce-exports --disable-zmq --enable-gui --with-gui=auto LDFLAGS=-static-libstdc++" BDB_INCLUDE_PATH="/usr/include" BDB_LIB_PATH="/usr/lib"
46+
# - HOST=i686-w64-mingw32 PPA="ppa:bitcoin/bitcoin" DEP_OPTS="" PACKAGES="g++-multilib python3 python3-dev python3-pip nsis bc faketime wine1.6 bc build-essential libc6-dev libtool autotools-dev automake cmake pkg-config bsdmainutils imagemagick libqt4-dev qt4-dev-tools libqt4-dev-bin libqt4-opengl-dev libqtwebkit-dev qt4-linguist-tools libminiupnpc-dev curl g++-mingw-w64-x86-64 mingw-w64-x86-64-dev g++-mingw-w64-i686 mingw-w64-i686-dev libevent-dev libboost-system-dev libboost-filesystem-dev libminiupnpc-dev libprotobuf-dev protobuf-compiler libqrencode-dev flex libelf-dev libdwarf-dev ttf-mscorefonts-installer ttf-mscorefonts-installer nsis-pluginapi libdb4.8++ libdb4.8 libdb4.8-dev db4.8-util libdb4.8++-dev firebird-dev libegl1-mesa-dev libpq-dev libsqlite3-dev unixodbc-dev"
47+
# RUN_TESTS=false GOAL="deploy" BITCOIN_CONFIG="--disable-gui-tests --disable-bench --enable-reduce-exports --disable-zmq --enable-gui --with-gui=auto LDFLAGS=-static-libstdc++" BDB_INCLUDE_PATH="/usr/include" BDB_LIB_PATH="/usr/lib"
48+
# - HOST=x86_64-w64-mingw32 PPA="ppa:bitcoin/bitcoin" DEP_OPTS="" PACKAGES="g++-multilib python3 python3-dev python3-pip nsis bc faketime wine1.6 bc build-essential libc6-dev libtool autotools-dev automake cmake pkg-config bsdmainutils imagemagick libqt4-dev qt4-dev-tools libqt4-dev-bin libqt4-opengl-dev libqtwebkit-dev qt4-linguist-tools libminiupnpc-dev curl g++-mingw-w64-x86-64 mingw-w64-x86-64-dev g++-mingw-w64-i686 mingw-w64-i686-dev libevent-dev libboost-system-dev libboost-filesystem-dev libminiupnpc-dev libprotobuf-dev protobuf-compiler libqrencode-dev flex libelf-dev libdwarf-dev ttf-mscorefonts-installer ttf-mscorefonts-installer nsis-pluginapi libdb4.8++ libdb4.8 libdb4.8-dev db4.8-util libdb4.8++-dev firebird-dev libegl1-mesa-dev libpq-dev libsqlite3-dev unixodbc-dev"
49+
# RUN_TESTS=false GOAL="deploy" BITCOIN_CONFIG="--disable-gui-tests --disable-bench --enable-reduce-exports --disable-zmq --enable-gui --with-gui=auto LDFLAGS=-static-libstdc++" BDB_INCLUDE_PATH="/usr/include" BDB_LIB_PATH="/usr/lib"
5050
# - HOST=x86_64-linux-gnu PPA="ppa:bitcoin/bitcoin" DEP_OPTS="" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6"
5151
# RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
5252
# - HOST=i686-linux-gnu PACKAGES="g++-multilib python3 python3-dev python3-pip nsis bc faketime wine1.6 bc build-essential libc6-dev libtool autotools-dev automake cmake pkg-config bsdmainutils imagemagick libqt4-dev qt4-dev-tools libqt4-dev-bin libqt4-opengl-dev libqtwebkit-dev qt4-linguist-tools libminiupnpc-dev curl g++-mingw-w64-x86-64 mingw-w64-x86-64-dev g++-mingw-w64-i686 mingw-w64-i686-dev libevent-dev libboost-system-dev libboost-filesystem-dev libminiupnpc-dev libprotobuf-dev protobuf-compiler libqrencode-dev flex libelf-dev libdwarf-dev ttf-mscorefonts-installer ttf-mscorefonts-installer nsis-pluginapi libdb4.8++ libdb4.8 libdb4.8-dev db4.8-util libdb4.8++-dev firebird-dev libegl1-mesa-dev libpq-dev libsqlite3-dev unixodbc-dev"
@@ -55,8 +55,10 @@ env:
5555
# DEP_OPTS="" RUN_TESTS=false GOAL="install"
5656
# BITCOIN_CONFIG="--enable-zmq --disable-gui-tests --disable-bench --disable-maintainer-mode --enable-glibc-back-compat --enable-reduce-exports --enable-gui --with-gui=auto CPPFLAGS=-DDEBUG_LOCKORDER "
5757
# PYZMQ=true
58-
- HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler"
59-
BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror --enable-sse2" OSX_SDK=10.11 GOAL="deploy"
58+
- HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.11 GOAL="deploy"
59+
60+
# - HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler"
61+
# BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror --enable-sse2" OSX_SDK=10.11 GOAL="deploy"
6062
# - HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler"
6163
# BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror --enable-sse2" OSX_SDK=10.8 GOAL="deploy"
6264
# - HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler"

‎depends/.gitignore

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ i686*
88
mips*
99
arm*
1010
aarch64*
11-
riscv32*
12-
riscv64*
11+
!patches/**
12+
!Makefile

‎depends/Makefile

100644100755
Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
.NOTPARALLEL :
22

33
SOURCES_PATH ?= $(BASEDIR)/sources
4-
WORK_PATH = $(BASEDIR)/work
54
BASE_CACHE ?= $(BASEDIR)/built
65
SDK_PATH ?= $(BASEDIR)/SDKs
76
NO_QT ?=
8-
RAPIDCHECK ?=
97
NO_WALLET ?=
108
NO_UPNP ?=
119
FALLBACK_DOWNLOAD_PATH ?= https://bitcoincore.org/depends-sources
@@ -15,14 +13,15 @@ HOST ?= $(BUILD)
1513
PATCHES_PATH = $(BASEDIR)/patches
1614
BASEDIR = $(CURDIR)
1715
HASH_LENGTH:=11
18-
DOWNLOAD_CONNECT_TIMEOUT:=30
16+
DOWNLOAD_CONNECT_TIMEOUT:=10
1917
DOWNLOAD_RETRIES:=3
2018
HOST_ID_SALT ?= salt
2119
BUILD_ID_SALT ?= salt
2220

2321
host:=$(BUILD)
2422
ifneq ($(HOST),)
2523
host:=$(HOST)
24+
host_toolchain:=$(HOST)-
2625
endif
2726

2827
ifneq ($(DEBUG),)
@@ -31,9 +30,9 @@ else
3130
release_type=release
3231
endif
3332

34-
base_build_dir=$(WORK_PATH)/build
35-
base_staging_dir=$(WORK_PATH)/staging
36-
base_download_dir=$(WORK_PATH)/download
33+
base_build_dir=$(BASEDIR)/work/build
34+
base_staging_dir=$(BASEDIR)/work/staging
35+
base_download_dir=$(BASEDIR)/work/download
3736
canonical_host:=$(shell ./config.sub $(HOST))
3837
build:=$(shell ./config.sub $(BUILD))
3938

@@ -94,19 +93,13 @@ qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch
9493
wallet_packages_$(NO_WALLET) = $(wallet_packages)
9594
upnp_packages_$(NO_UPNP) = $(upnp_packages)
9695

97-
rapidcheck_packages_$(RAPIDCHECK) = $(rapidcheck_packages)
98-
9996
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(wallet_packages_) $(upnp_packages_)
10097
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
10198

10299
ifneq ($(qt_packages_),)
103100
native_packages += $(qt_native_packages)
104101
endif
105102

106-
ifeq ($(rapidcheck_packages_),)
107-
packages += $(rapidcheck_packages)
108-
endif
109-
110103
all_packages = $(packages) $(native_packages)
111104

112105
meta_depends = Makefile funcs.mk builders/default.mk hosts/default.mk hosts/$(host_os).mk builders/$(build_os).mk
@@ -141,7 +134,6 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
141134
-e 's|@CXXFLAGS@|$(strip $(host_CXXFLAGS) $(host_$(release_type)_CXXFLAGS))|' \
142135
-e 's|@CPPFLAGS@|$(strip $(host_CPPFLAGS) $(host_$(release_type)_CPPFLAGS))|' \
143136
-e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \
144-
-e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \
145137
-e 's|@no_qt@|$(NO_QT)|' \
146138
-e 's|@no_wallet@|$(NO_WALLET)|' \
147139
-e 's|@no_upnp@|$(NO_UPNP)|' \
@@ -173,23 +165,17 @@ $(host_prefix)/share/config.site: check-packages
173165

174166
check-packages: check-sources
175167

176-
clean-all: clean
177-
@rm -rf $(SOURCES_PATH) x86_64* i686* mips* arm* aarch64* riscv32* riscv64*
178-
179-
clean:
180-
@rm -rf $(WORK_PATH) $(BASE_CACHE) $(BUILD)
181-
182168
install: check-packages $(host_prefix)/share/config.site
183169

184170

185171
download-one: check-sources $(all_sources)
186172

187173
download-osx:
188-
@$(MAKE) -s HOST=x86_64-apple-darwin14 download-one
174+
@$(MAKE) -s HOST=x86_64-apple-darwin11 download-one
189175
download-linux:
190176
@$(MAKE) -s HOST=x86_64-unknown-linux-gnu download-one
191177
download-win:
192178
@$(MAKE) -s HOST=x86_64-w64-mingw32 download-one
193179
download: download-osx download-linux download-win
194180

195-
.PHONY: install cached clean clean-all download-one download-osx download-linux download-win download check-packages check-sources
181+
.PHONY: install cached download-one download-osx download-linux download-win download check-packages check-sources

‎depends/README.md

100644100755
Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,48 +22,23 @@ Common `host-platform-triplets` for cross compilation are:
2222

2323
- `i686-w64-mingw32` for Win32
2424
- `x86_64-w64-mingw32` for Win64
25-
- `x86_64-apple-darwin14` for macOS
25+
- `x86_64-apple-darwin11` for MacOSX
2626
- `arm-linux-gnueabihf` for Linux ARM 32 bit
2727
- `aarch64-linux-gnu` for Linux ARM 64 bit
28-
- `riscv32-linux-gnu` for Linux RISC-V 32 bit
29-
- `riscv64-linux-gnu` for Linux RISC-V 64 bit
3028

3129
No other options are needed, the paths are automatically configured.
3230

33-
Install the required dependencies: Ubuntu & Debian
34-
--------------------------------------------------
35-
36-
For macOS cross compilation:
37-
38-
sudo apt-get install curl librsvg2-bin libtiff-tools bsdmainutils cmake imagemagick libcap-dev libz-dev libbz2-dev python-setuptools
39-
40-
For Win32/Win64 cross compilation:
41-
42-
- see [build-windows.md](../doc/build-windows.md#cross-compilation-for-ubuntu-and-windows-subsystem-for-linux)
43-
44-
For linux (including i386, ARM) cross compilation:
45-
46-
sudo apt-get install curl g++-aarch64-linux-gnu g++-4.8-aarch64-linux-gnu gcc-4.8-aarch64-linux-gnu binutils-aarch64-linux-gnu g++-arm-linux-gnueabihf g++-4.8-arm-linux-gnueabihf gcc-4.8-arm-linux-gnueabihf binutils-arm-linux-gnueabihf g++-4.8-multilib gcc-4.8-multilib binutils-gold bsdmainutils
47-
48-
For linux RISC-V 64-bit cross compilation (there are no packages for 32-bit):
49-
50-
sudo apt-get install curl g++-riscv64-linux-gnu binutils-riscv64-linux-gnu
51-
52-
RISC-V known issue: gcc-7.3.0 and gcc-7.3.1 result in a broken `test_bitcoin` executable (see https://github.com/bitcoin/bitcoin/pull/13543),
53-
this is apparently fixed in gcc-8.1.0.
54-
5531
Dependency Options:
5632
The following can be set when running make: make FOO=bar
5733

5834
SOURCES_PATH: downloaded sources will be placed here
5935
BASE_CACHE: built packages will be placed here
60-
SDK_PATH: Path where sdk's can be found (used by macOS)
36+
SDK_PATH: Path where sdk's can be found (used by OSX)
6137
FALLBACK_DOWNLOAD_PATH: If a source file can't be fetched, try here before giving up
6238
NO_QT: Don't download/build/cache qt and its dependencies
6339
NO_WALLET: Don't download/build/cache libs needed to enable the wallet
6440
NO_UPNP: Don't download/build/cache packages needed for enabling upnp
6541
DEBUG: disable some optimizations and enable more runtime checking
66-
RAPIDCHECK: build rapidcheck (experimental)
6742
HOST_ID_SALT: Optional salt to use when generating host package ids
6843
BUILD_ID_SALT: Optional salt to use when generating build package ids
6944

@@ -73,7 +48,7 @@ options will be passed to bitcoin's configure. In this case, `--disable-wallet`.
7348
Additional targets:
7449

7550
download: run 'make download' to fetch all sources without building them
76-
download-osx: run 'make download-osx' to fetch all sources needed for macOS builds
51+
download-osx: run 'make download-osx' to fetch all sources needed for osx builds
7752
download-win: run 'make download-win' to fetch all sources needed for win builds
7853
download-linux: run 'make download-linux' to fetch all sources needed for linux builds
7954

‎depends/builders/darwin.mk

100644100755
File mode changed.

‎depends/builders/default.mk

100644100755
File mode changed.

‎depends/builders/linux.mk

100644100755
File mode changed.

0 commit comments

Comments
 (0)