From 94c02d70c648c85431486e50b7f2bbbe4cde4bfa Mon Sep 17 00:00:00 2001 From: evoskuil Date: Sat, 12 Dec 2015 03:56:50 -0800 Subject: [PATCH 1/2] Update libsecp256k1 dependency. --- builds/msvc/vs2013/bs/bs.vcxproj | 6 +++--- builds/msvc/vs2013/bs/packages.config | 2 +- .../libbitcoin-server-test/libbitcoin-server-test.vcxproj | 6 +++--- builds/msvc/vs2013/libbitcoin-server-test/packages.config | 2 +- .../msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj | 6 +++--- builds/msvc/vs2013/libbitcoin-server/packages.config | 2 +- configure.ac | 4 +--- install.sh | 5 +++-- 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/builds/msvc/vs2013/bs/bs.vcxproj b/builds/msvc/vs2013/bs/bs.vcxproj index 3e253cf1..8ad89927 100644 --- a/builds/msvc/vs2013/bs/bs.vcxproj +++ b/builds/msvc/vs2013/bs/bs.vcxproj @@ -5,7 +5,7 @@ CTP_Nov2013 {F45B7D90-90BC-41EF-9AD1-9B29256A09FE} bs - d5ab076e + 47768994 @@ -89,8 +89,8 @@ - + @@ -107,8 +107,8 @@ - + diff --git a/builds/msvc/vs2013/bs/packages.config b/builds/msvc/vs2013/bs/packages.config index ab35baa5..98f9073a 100644 --- a/builds/msvc/vs2013/bs/packages.config +++ b/builds/msvc/vs2013/bs/packages.config @@ -12,5 +12,5 @@ - + diff --git a/builds/msvc/vs2013/libbitcoin-server-test/libbitcoin-server-test.vcxproj b/builds/msvc/vs2013/libbitcoin-server-test/libbitcoin-server-test.vcxproj index a698dcfb..6fffa3a3 100644 --- a/builds/msvc/vs2013/libbitcoin-server-test/libbitcoin-server-test.vcxproj +++ b/builds/msvc/vs2013/libbitcoin-server-test/libbitcoin-server-test.vcxproj @@ -5,7 +5,7 @@ v120 {66A0E586-2E3A-448F-BCD0-348AFEB0D5EA} libbitcoin-server-test - f1d64d8c + 8a2dc22f @@ -82,8 +82,8 @@ - + @@ -101,8 +101,8 @@ - + diff --git a/builds/msvc/vs2013/libbitcoin-server-test/packages.config b/builds/msvc/vs2013/libbitcoin-server-test/packages.config index 56d0796c..ccdac984 100644 --- a/builds/msvc/vs2013/libbitcoin-server-test/packages.config +++ b/builds/msvc/vs2013/libbitcoin-server-test/packages.config @@ -13,5 +13,5 @@ - + diff --git a/builds/msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj b/builds/msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj index 1e3ce44c..643d61bf 100644 --- a/builds/msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj +++ b/builds/msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj @@ -4,7 +4,7 @@ CTP_Nov2013 {73CE0AC2-ECB2-4E8D-A136-17840C0371A0} libbitcoin-server - d5ab076e + 665f46b3 @@ -122,8 +122,8 @@ - + @@ -140,7 +140,7 @@ - + \ No newline at end of file diff --git a/builds/msvc/vs2013/libbitcoin-server/packages.config b/builds/msvc/vs2013/libbitcoin-server/packages.config index ab35baa5..98f9073a 100644 --- a/builds/msvc/vs2013/libbitcoin-server/packages.config +++ b/builds/msvc/vs2013/libbitcoin-server/packages.config @@ -12,5 +12,5 @@ - + diff --git a/configure.ac b/configure.ac index 93b4db76..b6b96ae6 100644 --- a/configure.ac +++ b/configure.ac @@ -7,9 +7,7 @@ # Standard declarations. #============================================================================== -# Requires Automake 1.14 or newer. - -# Declare the required version of Autoconf. +# Declare the required version of autoconf. AC_PREREQ([2.65]) # Process command-line arguments and perform initialization and verification. diff --git a/install.sh b/install.sh index b02d842d..83596b17 100755 --- a/install.sh +++ b/install.sh @@ -240,7 +240,8 @@ CZMQPP_OPTIONS=\ # Define secp256k1 options. #------------------------------------------------------------------------------ SECP256K1_OPTIONS=\ -"--disable-tests " +"--disable-tests "\ +"--enable-module-recovery " # Define bitcoin options. #------------------------------------------------------------------------------ @@ -593,7 +594,7 @@ build_all() build_from_github zeromq libzmq master $PARALLEL "$@" $ZMQ_OPTIONS build_from_github zeromq czmq master $PARALLEL "$@" $CZMQ_OPTIONS build_from_github zeromq czmqpp master $PARALLEL "$@" $CZMQPP_OPTIONS - build_from_github libbitcoin secp256k1 version3 $PARALLEL "$@" $SECP256K1_OPTIONS + build_from_github libbitcoin secp256k1 version4 $PARALLEL "$@" $SECP256K1_OPTIONS build_from_github libbitcoin libbitcoin version2 $PARALLEL "$@" $BITCOIN_OPTIONS build_from_github libbitcoin libbitcoin-consensus version1 $PARALLEL "$@" $BITCOIN_CONSENSUS_OPTIONS build_from_github libbitcoin libbitcoin-blockchain version2 $PARALLEL "$@" $BITCOIN_BLOCKCHAIN_OPTIONS From 7556ad88bcfd7fd7c9c9b47c1286ca1a2e059363 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Sun, 13 Dec 2015 06:37:15 -0800 Subject: [PATCH 2/2] Remove OpenSSL MSVC dependency option. --- builds/msvc/vs2013/bs/bs.vcxproj | 4 +--- builds/msvc/vs2013/bs/packages.config | 1 - .../libbitcoin-server-test/libbitcoin-server-test.vcxproj | 4 +--- builds/msvc/vs2013/libbitcoin-server-test/packages.config | 1 - .../msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj | 4 +--- builds/msvc/vs2013/libbitcoin-server/packages.config | 1 - 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/builds/msvc/vs2013/bs/bs.vcxproj b/builds/msvc/vs2013/bs/bs.vcxproj index 8ad89927..b37ad155 100644 --- a/builds/msvc/vs2013/bs/bs.vcxproj +++ b/builds/msvc/vs2013/bs/bs.vcxproj @@ -5,7 +5,7 @@ CTP_Nov2013 {F45B7D90-90BC-41EF-9AD1-9B29256A09FE} bs - 47768994 + 1ef951ad @@ -89,7 +89,6 @@ - @@ -107,7 +106,6 @@ - diff --git a/builds/msvc/vs2013/bs/packages.config b/builds/msvc/vs2013/bs/packages.config index 98f9073a..c73d240e 100644 --- a/builds/msvc/vs2013/bs/packages.config +++ b/builds/msvc/vs2013/bs/packages.config @@ -11,6 +11,5 @@ - diff --git a/builds/msvc/vs2013/libbitcoin-server-test/libbitcoin-server-test.vcxproj b/builds/msvc/vs2013/libbitcoin-server-test/libbitcoin-server-test.vcxproj index 6fffa3a3..e6320738 100644 --- a/builds/msvc/vs2013/libbitcoin-server-test/libbitcoin-server-test.vcxproj +++ b/builds/msvc/vs2013/libbitcoin-server-test/libbitcoin-server-test.vcxproj @@ -5,7 +5,7 @@ v120 {66A0E586-2E3A-448F-BCD0-348AFEB0D5EA} libbitcoin-server-test - 8a2dc22f + e5840320 @@ -82,7 +82,6 @@ - @@ -101,7 +100,6 @@ - diff --git a/builds/msvc/vs2013/libbitcoin-server-test/packages.config b/builds/msvc/vs2013/libbitcoin-server-test/packages.config index ccdac984..c804b268 100644 --- a/builds/msvc/vs2013/libbitcoin-server-test/packages.config +++ b/builds/msvc/vs2013/libbitcoin-server-test/packages.config @@ -12,6 +12,5 @@ - diff --git a/builds/msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj b/builds/msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj index 643d61bf..a0ae0c76 100644 --- a/builds/msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj +++ b/builds/msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj @@ -4,7 +4,7 @@ CTP_Nov2013 {73CE0AC2-ECB2-4E8D-A136-17840C0371A0} libbitcoin-server - 665f46b3 + 5a63dbf2 @@ -122,7 +122,6 @@ - @@ -140,7 +139,6 @@ - \ No newline at end of file diff --git a/builds/msvc/vs2013/libbitcoin-server/packages.config b/builds/msvc/vs2013/libbitcoin-server/packages.config index 98f9073a..c73d240e 100644 --- a/builds/msvc/vs2013/libbitcoin-server/packages.config +++ b/builds/msvc/vs2013/libbitcoin-server/packages.config @@ -11,6 +11,5 @@ -