1 files changed, 69 insertions, 0 deletions
diff --git a/net-libs/libbitcoinconsensus/files/bugfix_bench_checks.patch b/net-libs/libbitcoinconsensus/files/bugfix_bench_checks.patch
new file mode 100644
index 000000000000..7319875e2d44
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/files/bugfix_bench_checks.patch
@@ -0,0 +1,69 @@
+commit 789200f22b3aa744f6d0054a702e3f7ea6303db4
+Author: Luke Dashjr <luke-jr+git@utopios.org>
+Date:   Tue Mar 1 14:14:29 2016 +0000
+
+    Bugfix: Check for bench_bitcoin being enabled where needed, and skip UniValue dependency when unused
+
+diff --git a/configure.ac b/configure.ac
+index e4fc443..a289e13 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -570,7 +570,7 @@ BITCOIN_QT_INIT
+ dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
+ BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5])
+ 
+-if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnononononono; then
+     use_boost=no
+ else
+     use_boost=yes
+@@ -754,7 +754,7 @@ if test x$use_pkgconfig = xyes; then
+       if test x$use_qr != xno; then
+         BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
+       fi
+-      if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
++      if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench != xnonononono; then
+         PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)])
+         if test x$TARGET_OS != xwindows; then
+           PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)])
+@@ -779,7 +779,7 @@ else
+   AC_CHECK_HEADER([openssl/ssl.h],, AC_MSG_ERROR(libssl headers missing),)
+   AC_CHECK_LIB([ssl],         [main],SSL_LIBS=-lssl, AC_MSG_ERROR(libssl missing))
+ 
+-  if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
++  if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench != xnonononono; then
+     AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),)
+     AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing))
+     if test x$TARGET_OS != xwindows; then
+@@ -810,6 +810,11 @@ fi
+ 
+ dnl univalue check
+ 
++AC_MSG_WARN([x$build_bitcoin_cli,$build_bitcoin_tx,$build_bitcoind,$bitcoin_enable_qt,$use_tests])
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnononononono; then
++    system_univalue=yes
++else
++
+ if test x$system_univalue != xno ; then
+   found_univalue=no
+   if test x$use_pkgconfig = xyes; then
+@@ -842,6 +847,8 @@ if test x$system_univalue = xno ; then
+   UNIVALUE_CFLAGS='-I$(srcdir)/univalue/include'
+   UNIVALUE_LIBS='univalue/libunivalue.la'
+ fi
++
++fi
+ AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$system_univalue = xno])
+ AC_SUBST(UNIVALUE_CFLAGS)
+ AC_SUBST(UNIVALUE_LIBS)
+@@ -991,8 +998,8 @@ else
+   AC_MSG_RESULT([no])
+ fi
+ 
+-if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then
+-  AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests])
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononononono; then
++  AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui --enable-tests or --enable-bench])
+ fi
+ 
+ AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])