Skip to content

Commit 53576bc

Browse files
fanquakeFuzzbawls
authored andcommitted
build: remove OpenSSL detection and libs
1 parent 5f30c2b commit 53576bc

6 files changed

+8
-17
lines changed

configure.ac

-9
Original file line numberDiff line numberDiff line change
@@ -558,13 +558,8 @@ case $host in
558558
dnl It's safe to add these paths even if the functionality is disabled by
559559
dnl the user (--without-wallet or --without-gui for example).
560560

561-
openssl_prefix=`$BREW --prefix openssl 2>/dev/null`
562561
bdb_prefix=`$BREW --prefix berkeley-db4 2>/dev/null`
563562
qt5_prefix=`$BREW --prefix qt5 2>/dev/null`
564-
if test x$openssl_prefix != x; then
565-
PKG_CONFIG_PATH="$openssl_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
566-
export PKG_CONFIG_PATH
567-
fi
568563
if test x$bdb_prefix != x; then
569564
CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include"
570565
LIBS="$LIBS -L$bdb_prefix/lib"
@@ -1118,7 +1113,6 @@ if test x$use_pkgconfig = xyes; then
11181113
m4_ifdef(
11191114
[PKG_CHECK_MODULES],
11201115
[
1121-
PKG_CHECK_MODULES([CRYPTO], [libcrypto],,[AC_MSG_ERROR(libcrypto not found.)])
11221116
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode],,[BITCOIN_QT_FAIL(libqrencode not found)])])
11231117
if test x$use_qtcharts != xno; then
11241118
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([CHARTS], [Qt5Charts],[have_qtcharts=yes], [have_qtcharts=no])])
@@ -1144,8 +1138,6 @@ if test x$use_pkgconfig = xyes; then
11441138
]
11451139
)
11461140
else
1147-
AC_CHECK_HEADER([openssl/crypto.h],,AC_MSG_ERROR(libcrypto headers missing))
1148-
AC_CHECK_LIB([crypto], [main],CRYPTO_LIBS=-lcrypto, AC_MSG_ERROR(libcrypto missing))
11491141

11501142
if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
11511143
AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),)
@@ -1481,7 +1473,6 @@ AC_SUBST(BOOST_LIBS)
14811473
AC_SUBST(TESTDEFS)
14821474
AC_SUBST(MINIUPNPC_CPPFLAGS)
14831475
AC_SUBST(MINIUPNPC_LIBS)
1484-
AC_SUBST(CRYPTO_LIBS)
14851476
AC_SUBST(EVENT_LIBS)
14861477
AC_SUBST(EVENT_PTHREADS_LIBS)
14871478
AC_SUBST(SODIUM_LIBS)

src/Makefile.am

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ LIBUNIVALUE = $(UNIVALUE_LIBS)
2020
endif
2121

2222
BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
23-
BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS)
23+
BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)
2424

2525
BITCOIN_INCLUDES += -I$(srcdir)/rust/include
2626
BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
@@ -621,7 +621,7 @@ pivxd_LDADD = \
621621
$(LIBRUSTZCASH) \
622622
$(LIBZCASH_LIBS)
623623

624-
pivxd_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)
624+
pivxd_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)
625625

626626
# pivx-cli binary #
627627
pivx_cli_SOURCES = pivx-cli.cpp
@@ -642,7 +642,7 @@ pivx_cli_LDADD = \
642642
$(LIBRUSTZCASH) \
643643
$(LIBZCASH_LIBS)
644644

645-
pivx_cli_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
645+
pivx_cli_LDADD += $(BOOST_LIBS) $(EVENT_LIBS)
646646
#
647647

648648
# pivx-tx binary #
@@ -666,7 +666,7 @@ pivx_tx_LDADD = \
666666
$(LIBRUSTZCASH) \
667667
$(LIBZCASH_LIBS)
668668

669-
pivx_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
669+
pivx_tx_LDADD += $(BOOST_LIBS)
670670
#
671671

672672
# bitcoinconsensus library #

src/Makefile.bench.include

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if ENABLE_ZMQ
4747
bench_bench_pivx_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
4848
endif
4949

50-
bench_bench_pivx_LDADD += $(LIBBITCOIN_CONSENSUS) $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
50+
bench_bench_pivx_LDADD += $(LIBBITCOIN_CONSENSUS) $(BOOST_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
5151
bench_bench_pivx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
5252

5353
# !TODO: .raw.h generated test files are not removed with make clean

src/Makefile.qt.include

+1-1
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ if ENABLE_ZMQ
646646
qt_pivx_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
647647
endif
648648
qt_pivx_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBBITCOIN_ZEROCOIN) $(LIBSAPLING) $(LIBRUSTZCASH) $(LIBZCASH_LIBS) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \
649-
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(SVG_LIBS) $(CHARTS_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
649+
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(SVG_LIBS) $(CHARTS_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
650650
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
651651
qt_pivx_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
652652
qt_pivx_qt_LIBTOOLFLAGS = $(AM_LIBTOOLFLAGS) --tag CXX

src/Makefile.qttest.include

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ qt_test_test_pivx_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
2828
endif
2929
qt_test_test_pivx_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBBITCOIN_ZEROCOIN) $(LIBLEVELDB) $(LIBSAPLING) $(LIBRUSTZCASH) $(LIBZCASH_LIBS) \
3030
$(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
31-
$(QR_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
31+
$(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
3232
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
3333
qt_test_test_pivx_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
3434
qt_test_test_pivx_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)

src/Makefile.test.include

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ endif
143143

144144
test_test_pivx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
145145

146-
test_test_pivx_LDADD += $(LIBRUSTZCASH) $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBZCASH_LIBS)
146+
test_test_pivx_LDADD += $(LIBRUSTZCASH) $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(LIBZCASH_LIBS)
147147
test_test_pivx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static
148148

149149
if ENABLE_ZMQ

0 commit comments

Comments
 (0)