Skip to content

Commit c2e0075

Browse files
authored
Merge pull request #1849 from codablock/pr_backport_bitcoin_0.14-4
Backport missing PRs from Bitcoin 0.14 - Part 4
2 parents 0adb4b7 + 8f13e25 commit c2e0075

File tree

145 files changed

+2168
-460
lines changed

Some content is hidden

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

145 files changed

+2168
-460
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,35 @@
11
<!--- Remove sections that do not apply -->
2+
3+
This issue tracker is only for technical issues related to bitcoin-core.
4+
5+
General bitcoin questions and/or support requests and are best directed to the [Bitcoin StackExchange](https://bitcoin.stackexchange.com).
6+
27
### Describe the issue
38

4-
### Is the issue reproducible?
5-
#### List steps to reproduce below:
6-
1.
7-
2.
8-
3.
9+
### Can you reliably reproduce the issue?
10+
#### If so, please list the steps to reproduce below:
11+
1.
12+
2.
13+
3.
914

10-
### Expected behavior
15+
### Expected behaviour
1116
Tell us what should happen
1217

13-
### Actual behavior
18+
### Actual behaviour
1419
Tell us what happens instead
1520

16-
### Any information in the debug.log file related to this issue?
17-
18-
### Screenshots (if available)
21+
### Screenshots.
22+
If the issue is related to the GUI, screenshots can be added to this issue via drag & drop.
1923

20-
### What binary version was used (official or self compiled)
24+
### What version of bitcoin-core are you using?
25+
List the version number/commit ID, and if it is an official binary, self compiled or a distribution package such as PPA.
2126

22-
### Machine specs: CPU, RAM, Disk space & OS (Windows, OS X, Linux)
27+
### Machine specs:
28+
- OS:
29+
- CPU:
30+
- RAM:
31+
- Disk size:
32+
- Disk Type (HD/SDD):
2333

34+
### Any extra information that might be useful in the debugging process.
35+
This is normally the contents of a `debug.log` or `config.log` file. Raw text or a link to a pastebin type site are preferred.

CONTRIBUTING.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,9 @@ language is used within pull-request comments:
178178

179179
- ACK means "I have tested the code and I agree it should be merged";
180180
- NACK means "I disagree this should be merged", and must be accompanied by
181-
sound technical justification. NACKs without accompanying reasoning may be disregarded;
181+
sound technical justification (or in certain cases of copyright/patent/licensing
182+
issues, legal justification). NACKs without accompanying reasoning may be
183+
disregarded;
182184
- utACK means "I have not tested the code, but I have reviewed it and it looks
183185
OK, I agree it can be merged";
184186
- Concept ACK means "I agree in the general principle of this pull request";

INSTALL

Lines changed: 0 additions & 30 deletions
This file was deleted.

INSTALL.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Building Dash
2+
=============
3+
4+
See doc/build-*.md for instructions on building the various
5+
elements of the Dash Core reference implementation of Dash.

Makefile.am

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright (c) 2013-2016 The Bitcoin Core developers
2+
# Copyright (c) 2014-2018 The Dash Core developers
3+
# Distributed under the MIT software license, see the accompanying
4+
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
5+
16
ACLOCAL_AMFLAGS = -I build-aux/m4
27
SUBDIRS = src
38
if ENABLE_MAN

autogen.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
#!/bin/sh
2+
# Copyright (c) 2013-2016 The Bitcoin Core developers
3+
# Distributed under the MIT software license, see the accompanying
4+
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
5+
26
set -e
37
srcdir="$(dirname $0)"
48
cd "$srcdir"

build-aux/m4/ax_boost_base.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
# and this notice are preserved. This file is offered as-is, without any
3434
# warranty.
3535

36-
#serial 26
36+
#serial 27
3737

3838
AC_DEFUN([AX_BOOST_BASE],
3939
[
@@ -96,7 +96,7 @@ if test "x$want_boost" = "xyes"; then
9696
libsubdirs="lib64 libx32 lib lib64"
9797
;;
9898
ppc64|s390x|sparc64|aarch64|ppc64le)
99-
libsubdirs="lib64 lib lib64 ppc64le"
99+
libsubdirs="lib64 lib lib64"
100100
;;
101101
esac
102102

build-aux/m4/bitcoin_find_bdb48.m4

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
dnl Copyright (c) 2013-2015 The Bitcoin Core developers
2+
dnl Distributed under the MIT software license, see the accompanying
3+
dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
15
AC_DEFUN([BITCOIN_FIND_BDB48],[
26
AC_MSG_CHECKING([for Berkeley DB C++ headers])
37
BDB_CPPFLAGS=

build-aux/m4/bitcoin_qt.m4

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
dnl Copyright (c) 2013-2016 The Bitcoin Core developers
2+
dnl Distributed under the MIT software license, see the accompanying
3+
dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
15
dnl Helper for cases where a qt dependency is not met.
26
dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit.
37
AC_DEFUN([BITCOIN_QT_FAIL],[

build-aux/m4/bitcoin_subdir_to_include.m4

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
dnl Copyright (c) 2013-2014 The Bitcoin Core developers
2+
dnl Distributed under the MIT software license, see the accompanying
3+
dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
15
dnl BITCOIN_SUBDIR_TO_INCLUDE([CPPFLAGS-VARIABLE-NAME],[SUBDIRECTORY-NAME],[HEADER-FILE])
26
dnl SUBDIRECTORY-NAME must end with a path separator
37
AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[

0 commit comments

Comments
 (0)