Skip to content

Commit 8983ee3

Browse files
committed
build: remove OpenSSL detection and libs
1 parent b49b6b0 commit 8983ee3

File tree

6 files changed

+8
-19
lines changed

6 files changed

+8
-19
lines changed

configure.ac

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -555,13 +555,8 @@ case $host in
555555
dnl It's safe to add these paths even if the functionality is disabled by
556556
dnl the user (--without-wallet or --without-gui for example).
557557

558-
openssl_prefix=`$BREW --prefix openssl 2>/dev/null`
559558
bdb_prefix=`$BREW --prefix berkeley-db4 2>/dev/null`
560559
qt5_prefix=`$BREW --prefix qt5 2>/dev/null`
561-
if test x$openssl_prefix != x; then
562-
PKG_CONFIG_PATH="$openssl_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
563-
export PKG_CONFIG_PATH
564-
fi
565560
if test x$bdb_prefix != x; then
566561
CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include"
567562
LIBS="$LIBS -L$bdb_prefix/lib"
@@ -1255,7 +1250,6 @@ if test x$use_pkgconfig = xyes; then
12551250
m4_ifdef(
12561251
[PKG_CHECK_MODULES],
12571252
[
1258-
PKG_CHECK_MODULES([CRYPTO], [libcrypto],,[AC_MSG_ERROR(libcrypto not found.)])
12591253
if test x$use_qr != xno; then
12601254
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
12611255
fi
@@ -1278,8 +1272,6 @@ if test x$use_pkgconfig = xyes; then
12781272
]
12791273
)
12801274
else
1281-
AC_CHECK_HEADER([openssl/crypto.h],,AC_MSG_ERROR(libcrypto headers missing))
1282-
AC_CHECK_LIB([crypto], [main],CRYPTO_LIBS=-lcrypto, AC_MSG_ERROR(libcrypto missing))
12831275

12841276
if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
12851277
AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),)
@@ -1599,7 +1591,6 @@ AC_SUBST(TESTDEFS)
15991591
AC_SUBST(LEVELDB_TARGET_FLAGS)
16001592
AC_SUBST(MINIUPNPC_CPPFLAGS)
16011593
AC_SUBST(MINIUPNPC_LIBS)
1602-
AC_SUBST(CRYPTO_LIBS)
16031594
AC_SUBST(EVENT_LIBS)
16041595
AC_SUBST(EVENT_PTHREADS_LIBS)
16051596
AC_SUBST(ZMQ_LIBS)

src/Makefile.am

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ else
1919
LIBUNIVALUE = $(UNIVALUE_LIBS)
2020
endif
2121

22-
BITCOIN_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS)
22+
BITCOIN_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)
2323

2424
BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
2525
BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS)
@@ -571,7 +571,7 @@ bitcoind_LDADD = \
571571
$(LIBMEMENV) \
572572
$(LIBSECP256K1)
573573

574-
bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)
574+
bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)
575575

576576
# bitcoin-cli binary #
577577
bitcoin_cli_SOURCES = bitcoin-cli.cpp
@@ -589,7 +589,7 @@ bitcoin_cli_LDADD = \
589589
$(LIBBITCOIN_UTIL) \
590590
$(LIBBITCOIN_CRYPTO)
591591

592-
bitcoin_cli_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
592+
bitcoin_cli_LDADD += $(BOOST_LIBS) $(EVENT_LIBS)
593593
#
594594

595595
# bitcoin-tx binary #
@@ -610,7 +610,7 @@ bitcoin_tx_LDADD = \
610610
$(LIBBITCOIN_CRYPTO) \
611611
$(LIBSECP256K1)
612612

613-
bitcoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
613+
bitcoin_tx_LDADD += $(BOOST_LIBS)
614614
#
615615

616616
# bitcoin-wallet binary #
@@ -637,7 +637,7 @@ bitcoin_wallet_LDADD = \
637637
$(LIBSECP256K1) \
638638
$(LIBUNIVALUE)
639639

640-
bitcoin_wallet_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(MINIUPNPC_LIBS) $(ZMQ_LIBS)
640+
bitcoin_wallet_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(MINIUPNPC_LIBS) $(ZMQ_LIBS)
641641
#
642642

643643
# bitcoinconsensus library #

src/Makefile.bench.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ bench_bench_bitcoin_SOURCES += bench/coin_selection.cpp
7676
bench_bench_bitcoin_SOURCES += bench/wallet_balance.cpp
7777
endif
7878

79-
bench_bench_bitcoin_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(MINIUPNPC_LIBS)
79+
bench_bench_bitcoin_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(MINIUPNPC_LIBS)
8080
bench_bench_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
8181

8282
CLEAN_BITCOIN_BENCH = bench/*.gcda bench/*.gcno $(GENERATED_BENCH_FILES)

src/Makefile.qt.include

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ endif
314314
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \
315315
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
316316
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
317-
qt_bitcoin_qt_LDADD += $(CRYPTO_LIBS)
318317
qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
319318
qt_bitcoin_qt_LIBTOOLFLAGS = $(AM_LIBTOOLFLAGS) --tag CXX
320319

src/Makefile.qttest.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
6363
endif
6464
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \
6565
$(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
66-
$(QR_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
66+
$(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
6767
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
6868
qt_test_test_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
6969
qt_test_test_bitcoin_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)

src/Makefile.test.include

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ FUZZ_SUITE_LD_COMMON = \
9191
$(LIBMEMENV) \
9292
$(LIBSECP256K1) \
9393
$(EVENT_LIBS) \
94-
$(CRYPTO_LIBS) \
9594
$(EVENT_PTHREADS_LIBS)
9695

9796
# test_bitcoin binary #
@@ -207,7 +206,7 @@ test_test_bitcoin_LDADD += $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_C
207206
$(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS)
208207
test_test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
209208

210-
test_test_bitcoin_LDADD += $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(RAPIDCHECK_LIBS)
209+
test_test_bitcoin_LDADD += $(BDB_LIBS) $(MINIUPNPC_LIBS) $(RAPIDCHECK_LIBS)
211210
test_test_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static
212211

213212
if ENABLE_ZMQ

0 commit comments

Comments
 (0)