Skip to content

Commit

Permalink
Merge pull request dogecoin#3214 from patricklodder/1.14.7-fix-avx2-q…
Browse files Browse the repository at this point in the history
…t-dep

build: constrain -lQt5PlatformSupport check as AVX2 dependency
  • Loading branch information
chromatic authored Nov 28, 2023
2 parents afdea1c + 4fe6972 commit 94f5ef4
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,6 @@ if test x$intel_avx2 = xyes; then
AC_CHECK_LIB([IPSec_MB],[sha1_one_block_avx2],LIBS=-lIPSec_MB, AC_MSG_ERROR(IPSec_MB missing))
AC_CHECK_LIB([IPSec_MB],[sha256_one_block_avx2],LIBS=-lIPSec_MB, AC_MSG_ERROR(IPSec_MB missing))
AC_CHECK_LIB([IPSec_MB],[sha512_one_block_avx2],LIBS=-lIPSec_MB, AC_MSG_ERROR(IPSec_MB missing))
AC_CHECK_LIB([Qt5PlatformSupport],[main],LIBS+=" -lQt5PlatformSupport", AC_MSG_ERROR(lib missing))
AC_CHECK_LIB([mingwthrd], [main],LIBS+=" -lmingwthrd", AC_MSG_ERROR(lib missing))
AC_CHECK_LIB([kernel32], [main],LIBS+=" -lkernel32", AC_MSG_ERROR(lib missing))
AC_CHECK_LIB([user32], [main],LIBS+=" -luser32", AC_MSG_ERROR(lib missing))
Expand All @@ -894,6 +893,12 @@ if test x$intel_avx2 = xyes; then
AC_CHECK_LIB([iphlpapi], [main],LIBS+=" -liphlpapi", AC_MSG_ERROR(lib missing))
AC_CHECK_LIB([crypt32], [main],LIBS+=" -lcrypt32", AC_MSG_ERROR(lib missing))
AC_CHECK_LIB([ssp], [main],LIBS+=" -lssp", AC_MSG_ERROR(lib missing))

dnl only check for Qt5 if we're actually building Qt
if test x$bitcoin_enable_qt != xno; then
AC_CHECK_LIB([Qt5PlatformSupport],[main],LIBS+=" -lQt5PlatformSupport", AC_MSG_ERROR(lib missing))
fi

AC_DEFINE(USE_AVX2, 1, [Define this symbol if intel axv2 works])
esac
fi
Expand Down

0 comments on commit 94f5ef4

Please sign in to comment.