Skip to content

Commit 1f124c1

Browse files
evoskuilevoskuil
committed
Merge pull request #55 from evoskuil/master
libbitcoin-consensus integration
2 parents e4c46e7 + 2594d39 commit 1f124c1

File tree

8 files changed

+122
-57
lines changed

8 files changed

+122
-57
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ install:
7272
script:
7373

7474
# Download and build libbitcoin-server and all dependencies.
75-
- if [[ $OSX && $CLANG && $STATIC ]]; then ./install.sh --enable-testnet --disable-shared --build-boost --prefix=$HOME/my-prefix; fi
76-
- if [[ $LINUX && $CLANG && $STATIC ]]; then ./install.sh --disable-shared --build-boost --prefix=$HOME/my-prefix CXXFLAGS='-Os -stdlib=libstdc++' LDLIBS='-lstdc++'; fi
75+
- if [[ $OSX && $CLANG && $STATIC ]]; then ./install.sh --without-consensus --with-secp256k1 --without-openssl --enable-testnet --disable-shared --build-boost --prefix=$HOME/my-prefix; fi
76+
- if [[ $LINUX && $CLANG && $STATIC ]]; then ./install.sh --with-secp256k1 --without-openssl --disable-shared --build-boost --prefix=$HOME/my-prefix CXXFLAGS='-Os -stdlib=libstdc++' LDLIBS='-lstdc++'; fi
7777
- if [[ $LINUX && $GCC && $STATIC ]]; then ./install.sh --disable-ndebug --disable-shared --build-boost --prefix=$HOME/my-prefix --build-dir=my-build --with-bash-completiondir CXXFLAGS='-Os -s'; fi
78-
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then ./install.sh --with-bash-completiondir; fi
78+
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then ./install.sh --with-secp256k1 --without-openssl --with-bash-completiondir; fi
7979
- if [[ $LINUX && $CLANG && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --disable-ndebug --disable-static CXXFLAGS='-Os -stdlib=libstdc++' LDLIBS='-lstdc++'; fi
80-
- if [[ $LINUX && $GCC && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --disable-static --build-boost --with-bash-completiondir CXXFLAGS='-Os -s'; fi
80+
- if [[ $LINUX && $GCC && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --without-consensus --disable-static --build-boost --with-bash-completiondir CXXFLAGS='-Os -s'; fi

‎builds/msvc/vs2013/bitcoin-server/bitcoin-server.props‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
<ImportGroup Label="PropertySheets">
2525
<Import Project="$(SolutionDir)libbitcoin.import.props" />
26+
<Import Project="$(SolutionDir)libbitcoin-consensus.import.props" />
2627
<Import Project="$(SolutionDir)libbitcoin-blockchain.import.props" />
2728
<Import Project="$(SolutionDir)libbitcoin-node.import.props" />
2829
</ImportGroup>
@@ -32,18 +33,23 @@
3233
<Linkage-libzmq>dynamic</Linkage-libzmq>
3334
<Linkage-czmq>dynamic</Linkage-czmq>
3435
<Linkage-czmqpp>dynamic</Linkage-czmqpp>
35-
<Linkage-secp256k1>static</Linkage-secp256k1>
36+
<Linkage-openssl>dynamic</Linkage-openssl>
37+
<Linkage-secp256k1>dynamic</Linkage-secp256k1>
38+
<Linkage-secp256k1>dynamic</Linkage-secp256k1>
3639
<Linkage-libbitcoin>dynamic</Linkage-libbitcoin>
40+
<Linkage-libbitcoin-consensus>dynamic</Linkage-libbitcoin-consensus>
3741
<Linkage-libbitcoin-blockchain>dynamic</Linkage-libbitcoin-blockchain>
3842
<Linkage-libbitcoin-node>dynamic</Linkage-libbitcoin-node>
3943
</PropertyGroup>
4044
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
4145
<Linkage-libsodium>ltcg</Linkage-libsodium>
42-
<Linkage-libzmq>static</Linkage-libzmq>
46+
<Linkage-libzmq>ltcg</Linkage-libzmq>
4347
<Linkage-czmq>ltcg</Linkage-czmq>
44-
<Linkage-czmqpp>static</Linkage-czmqpp>
45-
<Linkage-secp256k1>static</Linkage-secp256k1>
48+
<Linkage-czmqpp>ltcg</Linkage-czmqpp>
49+
<Linkage-openssl>static</Linkage-openssl>
50+
<Linkage-secp256k1>ltcg</Linkage-secp256k1>
4651
<Linkage-libbitcoin>ltcg</Linkage-libbitcoin>
52+
<Linkage-libbitcoin-consensus>ltcg</Linkage-libbitcoin-consensus>
4753
<Linkage-libbitcoin-blockchain>ltcg</Linkage-libbitcoin-blockchain>
4854
<Linkage-libbitcoin-node>ltcg</Linkage-libbitcoin-node>
4955
</PropertyGroup>
@@ -52,8 +58,10 @@
5258
<Linkage-libzmq>static</Linkage-libzmq>
5359
<Linkage-czmq>static</Linkage-czmq>
5460
<Linkage-czmqpp>static</Linkage-czmqpp>
61+
<Linkage-openssl>static</Linkage-openssl>
5562
<Linkage-secp256k1>static</Linkage-secp256k1>
5663
<Linkage-libbitcoin>static</Linkage-libbitcoin>
64+
<Linkage-libbitcoin-consensus>static</Linkage-libbitcoin-consensus>
5765
<Linkage-libbitcoin-blockchain>static</Linkage-libbitcoin-blockchain>
5866
<Linkage-libbitcoin-node>static</Linkage-libbitcoin-node>
5967
</PropertyGroup>
@@ -65,8 +73,10 @@
6573
<Message Text="Linkage-libzmq : $(Linkage-libzmq)" Importance="high"/>
6674
<Message Text="Linkage-czmq : $(Linkage-czmq)" Importance="high"/>
6775
<Message Text="Linkage-czmqpp : $(Linkage-czmqpp)" Importance="high"/>
76+
<Message Text="Linkage-openssl : $(Linkage-openssl)" Importance="high"/>
6877
<Message Text="Linkage-secp256k1 : $(Linkage-secp256k1)" Importance="high"/>
6978
<Message Text="Linkage-libbitcoin : $(Linkage-libbitcoin)" Importance="high"/>
79+
<Message Text="Linkage-_consensus : $(Linkage-libbitcoin-consensus)" Importance="high"/>
7080
<Message Text="Linkage-_blockchain: $(Linkage-libbitcoin-blockchain)" Importance="high"/>
7181
<Message Text="Linkage-_node : $(Linkage-libbitcoin-node)" Importance="high"/>
7282
</Target>

‎builds/msvc/vs2013/bitcoin-server/bitcoin-server.vcxproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PlatformToolset>CTP_Nov2013</PlatformToolset>
66
<ProjectGuid>{F45B7D90-90BC-41EF-9AD1-9B29256A09FE}</ProjectGuid>
77
<ProjectName>bitcoin-server</ProjectName>
8-
<NuGetPackageImportStamp>aeffc9d6</NuGetPackageImportStamp>
8+
<NuGetPackageImportStamp>d5ab076e</NuGetPackageImportStamp>
99
</PropertyGroup>
1010
<ItemGroup Label="ProjectConfigurations">
1111
<ProjectConfiguration Include="DebugDEXE|Win32">
@@ -124,6 +124,7 @@
124124
<Import Project="..\..\..\..\..\..\nuget\libsodium_vc120.1.0.0.0\build\native\libsodium_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libsodium_vc120.1.0.0.0\build\native\libsodium_vc120.targets')" />
125125
<Import Project="..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets')" />
126126
<Import Project="..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.7\build\native\secp256k1_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.7\build\native\secp256k1_vc120.targets')" />
127+
<Import Project="..\..\..\..\..\..\nuget\openssl_no-asm_vc120.1.0.1.800\build\native\openssl_no-asm_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\openssl_no-asm_vc120.1.0.1.800\build\native\openssl_no-asm_vc120.targets')" />
127128
</ImportGroup>
128129
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
129130
<PropertyGroup>
@@ -140,5 +141,6 @@
140141
<Error Condition="!Exists('..\..\..\..\..\..\nuget\czmq_vc120.3.0.1.0\build\native\czmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmq_vc120.3.0.1.0\build\native\czmq_vc120.targets'))" />
141142
<Error Condition="!Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets'))" />
142143
<Error Condition="!Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.7\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.7\build\native\secp256k1_vc120.targets'))" />
144+
<Error Condition="!Exists('..\..\..\..\..\..\nuget\openssl_no-asm_vc120.1.0.1.800\build\native\openssl_no-asm_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\openssl_no-asm_vc120.1.0.1.800\build\native\openssl_no-asm_vc120.targets'))" />
143145
</Target>
144146
</Project>

‎builds/msvc/vs2013/bitcoin-server/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
<package id="czmqpp_vc120" version="1.1.0.0" targetFramework="Native" />
1111
<package id="libsodium_vc120" version="1.0.0.0" targetFramework="Native" />
1212
<package id="libzmq_vc120" version="4.2.0.0" targetFramework="Native" />
13+
<package id="openssl_no-asm_vc120" version="1.0.1.800" targetFramework="Native" />
1314
<package id="secp256k1_vc120" version="0.1.0.7" targetFramework="Native" />
1415
</packages>

‎builds/msvc/vs2013/libbitcoin-consensus.import.props‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup Label="Globals">
5+
<_PropertySheetDisplayName>Libbitcoin Consensus Import Settings</_PropertySheetDisplayName>
6+
</PropertyGroup>
7+
8+
<!-- User Interface -->
9+
10+
<ItemGroup Label="BuildOptionsExtension">
11+
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)libbitcoin-consensus.import.xml" />
12+
</ItemGroup>
13+
14+
<!-- Linkage -->
15+
16+
<ItemDefinitionGroup>
17+
<ClCompile>
18+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
19+
<PreprocessorDefinitions Condition="'$(Option-secp256k1)' == 'true'">USE_SECP256K1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
20+
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-consensus)' == 'static' Or '$(Linkage-libbitcoin-consensus)' == 'ltcg'">BCX_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
21+
</ClCompile>
22+
<Link>
23+
<!-- $(PlatformToolset) is hard wired to v120 to allow for linkage by PlatformToolset=CTP_Nov2013 callers. -->
24+
<AdditionalDependencies Condition="'$(Linkage-libbitcoin-consensus)' != ''">libbitcoin-consensus.lib;%(AdditionalDependencies)</AdditionalDependencies>
25+
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Debug\v120\$(Linkage-libbitcoin-consensus)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
26+
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Release\v120\$(Linkage-libbitcoin-consensus)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
27+
</Link>
28+
</ItemDefinitionGroup>
29+
30+
<!-- Copy -->
31+
32+
<!-- $(PlatformToolset) is hard wired to v120 to allow for linkage by PlatformToolset=CTP_Nov2013 callers. -->
33+
<Target Name="Linkage-libbitcoin-consensus-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libbitcoin-consensus)' == 'dynamic'">
34+
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
35+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Debug\v120\dynamic\libbitcoin-consensus.dll"
36+
DestinationFiles="$(TargetDir)libbitcoin-consensus.dll"
37+
SkipUnchangedFiles="true" />
38+
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
39+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Debug\v120\dynamic\libbitcoin-consensus.pdb"
40+
DestinationFiles="$(TargetDir)libbitcoin-consensus.pdb"
41+
SkipUnchangedFiles="true" />
42+
<Copy Condition="$(Configuration.IndexOf('Release')) != -1"
43+
SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\bin\$(PlatformName)\Release\v120\dynamic\libbitcoin-consensus.dll"
44+
DestinationFiles="$(TargetDir)libbitcoin-consensus.dll"
45+
SkipUnchangedFiles="true" />
46+
</Target>
47+
48+
<!-- Messages -->
49+
50+
<Target Name="libbitcoin-consensus-option-info" BeforeTargets="PrepareForBuild">
51+
<Message Text="Option-secp256k1 : $(Option-secp256k1)" Importance="high"/>
52+
</Target>
53+
54+
<Target Name="libbitcoin-consensus-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libbitcoin-consensus)' == 'dynamic'">
55+
<Message Text="Copying libbitcoin-consensus.dll -&gt; $(TargetDir)libbitcoin-consensus.dll" Importance="high"/>
56+
<Message Text="Copying libbitcoin-consensus.pdb -&gt; $(TargetDir)libbitcoin-consensus.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
57+
</Target>
58+
59+
</Project>

‎builds/msvc/vs2013/libbitcoin-consensus.import.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
3+
<Rule Name="libbitcoin-consensus-options-uiextension" PageTemplate="tool" DisplayName="Bitcoin Consensus Options" SwitchPrefix="/" Order="1">
4+
<Rule.Categories>
5+
<Category Name="secp256k1" DisplayName="secp256k1" />
6+
</Rule.Categories>
7+
<Rule.DataSource>
8+
<DataSource Persistence="ProjectFile" ItemType="" />
9+
</Rule.DataSource>
10+
<EnumProperty Name="Option-secp256k1" DisplayName="Use secp256k1" Description="Use secp256k1 in place of OpenSSL" Category="secp256k1">
11+
<EnumValue Name="" DisplayName="No" />
12+
<EnumValue Name="true" DisplayName="Yes" />
13+
</EnumProperty>
14+
</Rule>
15+
<Rule Name="libbitcoin-consensus-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
16+
<Rule.Categories>
17+
<Category Name="libbitcoin-consensus" DisplayName="libbitcoin-consensus" />
18+
</Rule.Categories>
19+
<Rule.DataSource>
20+
<DataSource Persistence="ProjectFile" ItemType="" />
21+
</Rule.DataSource>
22+
<EnumProperty Name="Linkage-libbitcoin-consensus" DisplayName="Linkage" Description="How libbitcoin-consensus will be linked into the output of this project" Category="libbitcoin-consensus">
23+
<EnumValue Name="none" DisplayName="Not linked" />
24+
<EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
25+
<EnumValue Name="static" DisplayName="Static (LIB)" />
26+
<EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
27+
</EnumProperty>
28+
</Rule>
29+
</ProjectSchemaDefinitions>

‎builds/msvc/vs2013/libbitcoin.import.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
3131
</Link>
3232
<Link Condition="$(PlatformToolset) != 'CTP_Nov2013'">
33-
<!-- Need to link $(VC_CTP_Nov2013_LibraryPath_x86), $(VC_CTP_Nov2013_LibraryPath_x64), or $(VC_CTP_Nov2013_LibraryPath_ARM).-->
33+
<!-- Need to link $(VC_CTP_Nov2013_LibraryPath_x86), $(VC_CTP_Nov2013_LibraryPath_x64), or $(VC_CTP_Nov2013_LibraryPath_ARM). -->
3434
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'ARM'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
3535
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'x64'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
3636
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'Win32'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -57,7 +57,7 @@
5757

5858
<!-- Messages -->
5959

60-
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
60+
<Target Name="libbitcoin-option-info" BeforeTargets="PrepareForBuild">
6161
<Message Text="Option-testnet : $(Option-testnet)" Importance="high"/>
6262
</Target>
6363

‎install.sh‎

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,7 @@ for OPTION in "$@"; do
8484
case $OPTION in
8585
(--prefix=*) PREFIX="${OPTION#*=}";;
8686
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
87-
88-
(--build-gmp) BUILD_GMP="yes";;
8987
(--build-boost) BUILD_BOOST="yes";;
90-
9188
(--disable-shared) DISABLE_SHARED="yes";;
9289
(--disable-static) DISABLE_STATIC="yes";;
9390
esac
@@ -98,7 +95,7 @@ echo "Prefix directory: $PREFIX"
9895
# Purge our custom options so they don't go to configure.
9996
#------------------------------------------------------------------------------
10097
CONFIGURE_OPTIONS=( "$@" )
101-
CUSTOM_OPTIONS=( "--build-dir=$BUILD_DIR" "--build-boost" "--build-gmp" )
98+
CUSTOM_OPTIONS=( "--build-dir=$BUILD_DIR" "--build-boost" )
10299
for CUSTOM_OPTION in "${CUSTOM_OPTIONS[@]}"; do
103100
CONFIGURE_OPTIONS=( "${CONFIGURE_OPTIONS[@]/$CUSTOM_OPTION}" )
104101
done
@@ -144,12 +141,7 @@ if [[ $PREFIX ]]; then
144141
if [[ $BUILD_BOOST == yes ]]; then
145142
with_boost="--with-boost=$PREFIX"
146143
fi
147-
148-
# Set public gmp_flags variable (because GMP has no pkg-config).
149-
if [[ $BUILD_GMP == yes ]]; then
150-
gmp_flags="CPPFLAGS=-I$PREFIX/include LDFLAGS=-L$PREFIX/lib"
151-
fi
152-
144+
153145
# Set public prefix variable (to tell Boost where to build).
154146
prefix="--prefix=$PREFIX"
155147
fi
@@ -160,7 +152,6 @@ echo "Published dynamic options:"
160152
echo " boost_link: $boost_link"
161153
echo " boost_stdlib: $boost_stdlib"
162154
echo " prefix: $prefix"
163-
echo " gmp_flags: $gmp_flags"
164155
echo " with_boost: $with_boost"
165156
echo " with_pkgconfigdir: $with_pkgconfigdir"
166157

@@ -242,6 +233,13 @@ BITCOIN_OPTIONS=\
242233
"${with_boost} "\
243234
"${with_pkgconfigdir} "
244235

236+
# Define bitcoin-consensus options.
237+
#------------------------------------------------------------------------------
238+
BITCOIN_CONSENSUS_OPTIONS=\
239+
"--without-tests "\
240+
"${with_boost} "\
241+
"${with_pkgconfigdir} "
242+
245243
# Define bitcoin-blockchain options.
246244
#------------------------------------------------------------------------------
247245
BITCOIN_BLOCKCHAIN_OPTIONS=\
@@ -406,41 +404,6 @@ build_from_tarball_boost()
406404
pop_directory
407405
}
408406

409-
build_from_tarball_gmp()
410-
{
411-
local URL=$1
412-
local ARCHIVE=$2
413-
local REPO=$3
414-
local JOBS=$4
415-
shift 4
416-
417-
if [[ $BUILD_GMP != yes ]]; then
418-
display_message "GMP build not enabled"
419-
return
420-
fi
421-
422-
display_message "Download $ARCHIVE"
423-
424-
create_directory $REPO
425-
push_directory $REPO
426-
427-
# Extract the source locally.
428-
wget --output-document $ARCHIVE $URL
429-
tar --extract --file $ARCHIVE --bzip2 --strip-components=1
430-
431-
# Build the local sources.
432-
# GMP does not provide autogen.sh or package config.
433-
configure_options "$@"
434-
435-
# GMP does not honor noise reduction.
436-
echo "Making all..."
437-
make_jobs $JOBS >/dev/null
438-
echo "Installing all..."
439-
make install >/dev/null
440-
441-
pop_directory
442-
}
443-
444407
build_from_github()
445408
{
446409
local ACCOUNT=$1
@@ -509,6 +472,7 @@ build_all()
509472
build_from_github zeromq czmqpp master $PARALLEL "$@" $CZMQPP_OPTIONS
510473
build_from_github libbitcoin secp256k1 version2 $PARALLEL "$@" $SECP256K1_OPTIONS
511474
build_from_github libbitcoin libbitcoin master $PARALLEL "$@" $BITCOIN_OPTIONS
475+
build_from_github libbitcoin libbitcoin-consensus master $PARALLEL "$@" $BITCOIN_CONSENSUS_OPTIONS
512476
build_from_github libbitcoin libbitcoin-blockchain master $PARALLEL "$@" $BITCOIN_BLOCKCHAIN_OPTIONS
513477
build_from_github libbitcoin libbitcoin-node master $PARALLEL "$@" $BITCOIN_NODE_OPTIONS
514478
build_from_travis libbitcoin libbitcoin-server version2 $PARALLEL "$@" $BITCOIN_SERVER_OPTIONS

0 commit comments

Comments
 (0)