Skip to content

Commit bd1fa44

Browse files
evoskuilevoskuil
committed
Regenerate with latest libbitcoin-build.
1 parent 72c6a37 commit bd1fa44

File tree

4 files changed

+115
-44
lines changed

4 files changed

+115
-44
lines changed

‎Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ doc_DATA = \
3232
# src/libbitcoin-protocol.la => ${libdir}
3333
#------------------------------------------------------------------------------
3434
lib_LTLIBRARIES = src/libbitcoin-protocol.la
35-
src_libbitcoin_protocol_la_CPPFLAGS = -I${srcdir}/include ${mbedtls} ${zmq_BUILD_CPPFLAGS} ${bitcoin_system_BUILD_CPPFLAGS} ${mbedtls_BUILD_CPPFLAGS}
36-
src_libbitcoin_protocol_la_LIBADD = ${zmq_LIBS} ${bitcoin_system_LIBS} ${mbedtls_LIBS}
35+
src_libbitcoin_protocol_la_CPPFLAGS = -I${srcdir}/include ${mbedtls} ${zmq_BUILD_CPPFLAGS} ${mbedtls_BUILD_CPPFLAGS} ${bitcoin_system_BUILD_CPPFLAGS}
36+
src_libbitcoin_protocol_la_LIBADD = ${zmq_LIBS} ${mbedtls_LIBS} ${bitcoin_system_LIBS}
3737
src_libbitcoin_protocol_la_SOURCES = \
3838
src/settings.cpp \
3939
src/web/connection.cpp \
@@ -60,8 +60,8 @@ if WITH_TESTS
6060
TESTS = libbitcoin-protocol-test_runner.sh
6161

6262
check_PROGRAMS = test/libbitcoin-protocol-test
63-
test_libbitcoin_protocol_test_CPPFLAGS = -I${srcdir}/include ${mbedtls} ${zmq_BUILD_CPPFLAGS} ${bitcoin_system_BUILD_CPPFLAGS} ${mbedtls_BUILD_CPPFLAGS}
64-
test_libbitcoin_protocol_test_LDADD = src/libbitcoin-protocol.la ${boost_unit_test_framework_LIBS} ${zmq_LIBS} ${bitcoin_system_LIBS} ${mbedtls_LIBS}
63+
test_libbitcoin_protocol_test_CPPFLAGS = -I${srcdir}/include ${mbedtls} ${zmq_BUILD_CPPFLAGS} ${mbedtls_BUILD_CPPFLAGS} ${bitcoin_system_BUILD_CPPFLAGS}
64+
test_libbitcoin_protocol_test_LDADD = src/libbitcoin-protocol.la ${boost_unit_test_framework_LIBS} ${zmq_LIBS} ${mbedtls_LIBS} ${bitcoin_system_LIBS}
6565
test_libbitcoin_protocol_test_SOURCES = \
6666
test/converter.cpp \
6767
test/main.cpp \

‎builds/cmake/CMakeLists.txt

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -115,42 +115,42 @@ set( boost_LDFLAGS "-L${Boost_LIBRARY_DIR}" )
115115
#------------------------------------------------------------------------------
116116
find_package( Zmq 4.2.5 REQUIRED )
117117

118-
# Find bitcoin-system
119-
#------------------------------------------------------------------------------
120-
find_package( Bitcoin-System 4.0.0 REQUIRED )
121-
122118
# Find mbedtls
123119
#------------------------------------------------------------------------------
124120
if (with-mbedtls)
125121
find_package( Mbedtls REQUIRED )
126122
endif()
127123

124+
# Find bitcoin-system
125+
#------------------------------------------------------------------------------
126+
find_package( Bitcoin-System 4.0.0 REQUIRED )
127+
128128
# Define project common includes directories
129129
#------------------------------------------------------------------------------
130130
if (BUILD_SHARED_LIBS)
131131
include_directories( SYSTEM
132132
${zmq_INCLUDE_DIRS}
133-
${bitcoin_system_INCLUDE_DIRS}
134-
${mbedtls_INCLUDE_DIRS} )
133+
${mbedtls_INCLUDE_DIRS}
134+
${bitcoin_system_INCLUDE_DIRS} )
135135
else()
136136
include_directories( SYSTEM
137137
${zmq_STATIC_INCLUDE_DIRS}
138-
${bitcoin_system_STATIC_INCLUDE_DIRS}
139-
${mbedtls_STATIC_INCLUDE_DIRS} )
138+
${mbedtls_STATIC_INCLUDE_DIRS}
139+
${bitcoin_system_STATIC_INCLUDE_DIRS} )
140140
endif()
141141

142142
# Define project common library directories
143143
#------------------------------------------------------------------------------
144144
if (BUILD_SHARED_LIBS)
145145
link_directories(
146146
${zmq_LIBRARY_DIRS}
147-
${bitcoin_system_LIBRARY_DIRS}
148-
${mbedtls_LIBRARY_DIRS} )
147+
${mbedtls_LIBRARY_DIRS}
148+
${bitcoin_system_LIBRARY_DIRS} )
149149
else()
150150
link_directories(
151151
${zmq_STATIC_LIBRARY_DIRS}
152-
${bitcoin_system_STATIC_LIBRARY_DIRS}
153-
${mbedtls_STATIC_LIBRARY_DIRS} )
152+
${mbedtls_STATIC_LIBRARY_DIRS}
153+
${bitcoin_system_STATIC_LIBRARY_DIRS} )
154154
endif()
155155

156156
# Define project common libraries/linker flags.
@@ -160,15 +160,15 @@ if (BUILD_SHARED_LIBS)
160160
"-fstack-protector"
161161
"-fstack-protector-all"
162162
${zmq_LIBRARIES}
163-
${bitcoin_system_LIBRARIES}
164-
${mbedtls_LIBRARIES} )
163+
${mbedtls_LIBRARIES}
164+
${bitcoin_system_LIBRARIES} )
165165
else()
166166
link_libraries(
167167
"-fstack-protector"
168168
"-fstack-protector-all"
169169
${zmq_STATIC_LIBRARIES}
170-
${bitcoin_system_STATIC_LIBRARIES}
171-
${mbedtls_STATIC_LIBRARIES} )
170+
${mbedtls_STATIC_LIBRARIES}
171+
${bitcoin_system_STATIC_LIBRARIES} )
172172
endif()
173173

174174
add_definitions(
@@ -201,14 +201,14 @@ if (BUILD_SHARED_LIBS)
201201
target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE
202202
"../../include"
203203
${zmq_INCLUDE_DIRS}
204-
${bitcoin_system_INCLUDE_DIRS}
205-
${mbedtls_INCLUDE_DIRS} )
204+
${mbedtls_INCLUDE_DIRS}
205+
${bitcoin_system_INCLUDE_DIRS} )
206206
else()
207207
target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE
208208
"../../include"
209209
${zmq_STATIC_INCLUDE_DIRS}
210-
${bitcoin_system_STATIC_INCLUDE_DIRS}
211-
${mbedtls_STATIC_INCLUDE_DIRS} )
210+
${mbedtls_STATIC_INCLUDE_DIRS}
211+
${bitcoin_system_STATIC_INCLUDE_DIRS} )
212212
endif()
213213

214214
target_include_directories( ${CANONICAL_LIB_NAME} PUBLIC
@@ -219,13 +219,13 @@ target_include_directories( ${CANONICAL_LIB_NAME} PUBLIC
219219
if (BUILD_SHARED_LIBS)
220220
target_link_libraries( ${CANONICAL_LIB_NAME}
221221
${zmq_LIBRARIES}
222-
${bitcoin_system_LIBRARIES}
223-
${mbedtls_LIBRARIES} )
222+
${mbedtls_LIBRARIES}
223+
${bitcoin_system_LIBRARIES} )
224224
else()
225225
target_link_libraries( ${CANONICAL_LIB_NAME}
226226
${zmq_STATIC_LIBRARIES}
227-
${bitcoin_system_STATIC_LIBRARIES}
228-
${mbedtls_STATIC_LIBRARIES} )
227+
${mbedtls_STATIC_LIBRARIES}
228+
${bitcoin_system_STATIC_LIBRARIES} )
229229
endif()
230230

231231
# Define libbitcoin-protocol-test project.

‎builds/cmake/modules/FindMbedtls.cmake

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
###############################################################################
2+
# Copyright (c) 2014-2018 libbitcoin developers (see COPYING).
3+
#
4+
###############################################################################
5+
# FindMbedtls
6+
#
7+
# Use this module by invoking find_package with the form::
8+
#
9+
# find_package( Mbedtls
10+
# [version] # Minimum version (ignored)
11+
# [REQUIRED] # Fail with error if mbedtls is not found
12+
# )
13+
#
14+
# Defines the following for use:
15+
#
16+
# mbedtls_FOUND - true if headers and requested libraries were found
17+
# mbedtls_LIBRARIES - mbedtls libraries to be linked
18+
# mbedtls_LIBS - mbedtls libraries to be linked
19+
#
20+
21+
if (DEFINED Mbedtls_FIND_VERSION)
22+
message( SEND_ERROR
23+
"Library 'mbedtls' unable to process version: ${Mbedtls_FIND_VERSION}" )
24+
endif()
25+
26+
27+
if (MSVC)
28+
set( mbedtls_FOUND false )
29+
message( STATUS
30+
"MSVC environment detection for 'mbedtls' not currently supported." )
31+
else ()
32+
# conditionally include static library suffix
33+
if (BUILD_SHARED_LIBS)
34+
set( _mbedcrypto_lib_name "mbedcrypto" )
35+
set( _mbedtls_lib_name "mbedtls" )
36+
set( _mbedx509_lib_name "mbedx509" )
37+
else ()
38+
set( _mbedcrypto_lib_name "libmbedcrypto.a" )
39+
set( _mbedtls_lib_name "libmbedtls.a" )
40+
set( _mbedx509_lib_name "libmbedx509.a" )
41+
endif()
42+
43+
find_library( tls_LIBRARIES "${_mbedtls_lib_name}" )
44+
find_library( crypto_LIBRARIES "${_mbedcrypto_lib_name}" )
45+
find_library( x509_LIBRARIES "${_mbedx509_lib_name}" )
46+
47+
if (tls_LIBRARIES-NOTFOUND OR crypto_LIBRARIES-NOTFOUND OR x509_LIBRARIES-NOTFOUND)
48+
set( mbedtls_FOUND false )
49+
else ()
50+
set( mbedtls_FOUND true )
51+
set( mbedtls_LIBRARIES "${tls_LIBRARIES};${crypto_LIBRARIES};${x509_LIBRARIES}" )
52+
set( mbedtls_LIBS "-lmbedtls -lmbedcrypto -lmbedx509" )
53+
endif()
54+
55+
if (NOT BUILD_SHARED_LIBS)
56+
set( mbedtls_STATIC_LIBRARIES "${mbedtls_LIBRARIES}" )
57+
endif()
58+
endif()
59+
60+
61+
if (NOT mbedtls_FOUND)
62+
if ( Mbedtls_FIND_REQUIRED )
63+
set( _mbedtls_MSG_STATUS "SEND_ERROR" )
64+
else ()
65+
set( _mbedtls_MSG_STATUS "STATUS" )
66+
endif()
67+
68+
message( _mbedtls_MSG_STATUS "Library 'mbedtls' not found (${_mbedtls_MSG_STATUS})." )
69+
else ()
70+
message( "Library 'mbedtls' found." )
71+
endif()

‎configure.ac

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,22 @@ AS_CASE([${enable_isystem}],[yes],
185185

186186
AC_MSG_NOTICE([zmq_BUILD_CPPFLAGS : ${zmq_BUILD_CPPFLAGS}])
187187

188+
# Require mbedtls of at least version 2.12.0 and output ${mbedtls_CPPFLAGS/LIBS/PKG}.
189+
#------------------------------------------------------------------------------
190+
AS_CASE([${with_mbedtls}], [yes],
191+
[AC_SUBST([mbedtls_INCLUDEDIR], [])
192+
AC_SUBST([mbedtls_OTHER_CPPFLAGS], [])
193+
AC_SUBST([mbedtls_CPPFLAGS], [])
194+
AC_SUBST([mbedtls_ISYS_CPPFLAGS], [])
195+
AC_SUBST([mbedtls_LIBS], ["-lmbedtls -lmbedcrypto -lmbedx509"])
196+
AC_MSG_NOTICE([mbedtls presumed, not detected - absence of -lmbedtls -lmbedcrypto -lmbedx509 may result in link error.])], [])
197+
198+
AS_CASE([${enable_isystem}],[yes],
199+
[AC_SUBST([mbedtls_BUILD_CPPFLAGS], [${mbedtls_ISYS_CPPFLAGS}])],
200+
[AC_SUBST([mbedtls_BUILD_CPPFLAGS], [${mbedtls_CPPFLAGS}])])
201+
202+
AC_MSG_NOTICE([mbedtls_BUILD_CPPFLAGS : ${mbedtls_BUILD_CPPFLAGS}])
203+
188204
# Require bitcoin-system of at least version 4.0.0 and output ${bitcoin_system_CPPFLAGS/LIBS/PKG}.
189205
#------------------------------------------------------------------------------
190206
PKG_CHECK_MODULES([bitcoin_system], [libbitcoin-system >= 4.0.0],
@@ -209,22 +225,6 @@ AS_CASE([${enable_isystem}],[yes],
209225

210226
AC_MSG_NOTICE([bitcoin_system_BUILD_CPPFLAGS : ${bitcoin_system_BUILD_CPPFLAGS}])
211227

212-
# Require mbedtls of at least version 2.12.0 and output ${mbedtls_CPPFLAGS/LIBS/PKG}.
213-
#------------------------------------------------------------------------------
214-
AS_CASE([${with_mbedtls}], [yes],
215-
[AC_SUBST([mbedtls_INCLUDEDIR], [])
216-
AC_SUBST([mbedtls_OTHER_CPPFLAGS], [])
217-
AC_SUBST([mbedtls_CPPFLAGS], [])
218-
AC_SUBST([mbedtls_ISYS_CPPFLAGS], [])
219-
AC_SUBST([mbedtls_LIBS], ["-lmbedtls -lmbedcrypto -lmbedx509"])
220-
AC_MSG_NOTICE([mbedtls presumed, not detected - absence of -lmbedtls -lmbedcrypto -lmbedx509 may result in link error.])], [])
221-
222-
AS_CASE([${enable_isystem}],[yes],
223-
[AC_SUBST([mbedtls_BUILD_CPPFLAGS], [${mbedtls_ISYS_CPPFLAGS}])],
224-
[AC_SUBST([mbedtls_BUILD_CPPFLAGS], [${mbedtls_CPPFLAGS}])])
225-
226-
AC_MSG_NOTICE([mbedtls_BUILD_CPPFLAGS : ${mbedtls_BUILD_CPPFLAGS}])
227-
228228

229229
# Set flags.
230230
#==============================================================================

0 commit comments

Comments
 (0)