nathan/agrarian
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Qt OpenSSL TLS plugin optional

Browse Source
This commit is contained in:
root
2026-05-01 16:15:17 +00:00
parent 906a6affea
commit 223cf305e9
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-aux/m4/bitcoin_qt.m4
+3 -2
View File
@@ -138,8 +138,9 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
AC_DEFINE(QT_QPA_PLATFORM_MINIMAL, 1, [Define this symbol if the minimal qt platform exists]) AC_DEFINE(QT_QPA_PLATFORM_MINIMAL, 1, [Define this symbol if the minimal qt platform exists])
]) ])
if test "x$QT_LIB_PREFIX" = xQt6; then if test "x$QT_LIB_PREFIX" = xQt6; then
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QTlsBackendOpenSSL)],[-lqopensslbackend -lssl -lcrypto]) _BITCOIN_QT_CHECK_STATIC_PLUGINS_OPTIONAL([Q_IMPORT_PLUGIN(QTlsBackendOpenSSL)],[-lqopensslbackend -lssl -lcrypto],[
AC_DEFINE(QT_TLS_OPENSSL, 1, [Define this symbol if the Qt OpenSSL TLS backend exists]) AC_DEFINE(QT_TLS_OPENSSL, 1, [Define this symbol if the Qt OpenSSL TLS backend exists])
])
fi fi
if test "x$TARGET_OS" = xwindows; then if test "x$TARGET_OS" = xwindows; then
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)],[-lqwindows]) _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)],[-lqwindows])
contrib/build-linux-wallet.sh
+1 -1
View File
@@ -101,7 +101,7 @@ if [[ ! -f configure || ! -f src/secp256k1/configure || ! -f src/secp256k1/Makef
./autogen.sh ./autogen.sh
fi fi
if [[ build-aux/m4/bitcoin_qt.m4 -nt configure ]]; then if [[ build-aux/m4/bitcoin_qt.m4 -nt configure || build-aux/m4/bitcoin_qt.m4 -nt aclocal.m4 ]]; then
./autogen.sh ./autogen.sh
fi fi
contrib/build-win64-wallet.sh
+4
View File
@@ -115,6 +115,10 @@ if [[ ! -f configure || ! -f src/secp256k1/configure || ! -f src/secp256k1/Makef
./autogen.sh ./autogen.sh
fi fi
if [[ build-aux/m4/bitcoin_qt.m4 -nt configure || build-aux/m4/bitcoin_qt.m4 -nt aclocal.m4 ]]; then
./autogen.sh
fi
echo "Configuring Win64 Qt6 wallet build..." echo "Configuring Win64 Qt6 wallet build..."
CONFIG_SITE="$PREFIX/share/config.site" ./configure \ CONFIG_SITE="$PREFIX/share/config.site" ./configure \
--prefix=/ \ --prefix=/ \