summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2016-07-01 17:27:37 +0000
committerAnthony G. Basile <blueness@gentoo.org>2016-07-01 19:31:39 -0400
commit2c978e47a95b4cdc14e5cacff5617607979dacb0 (patch)
tree6f6595adb2dd7f709303f69083bfede34e61b872 /net-libs/libbitcoinconsensus
parentBugfix: libbitcoinconsensus depends on univalue/boost only with USE=test (diff)
downloadgentoo-2c978e47a95b4cdc14e5cacff5617607979dacb0.tar.gz
gentoo-2c978e47a95b4cdc14e5cacff5617607979dacb0.tar.bz2
gentoo-2c978e47a95b4cdc14e5cacff5617607979dacb0.zip
Bugfix: net-libs/libbitcoinconsensus-0.12.0: Build without univalue
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'net-libs/libbitcoinconsensus')
-rw-r--r--net-libs/libbitcoinconsensus/files/0.12.0-no_univalue.patch35
-rw-r--r--net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild6
2 files changed, 41 insertions, 0 deletions
diff --git a/net-libs/libbitcoinconsensus/files/0.12.0-no_univalue.patch b/net-libs/libbitcoinconsensus/files/0.12.0-no_univalue.patch
new file mode 100644
index 000000000000..c6d8f6359042
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/files/0.12.0-no_univalue.patch
@@ -0,0 +1,35 @@
+From c0251eab760f00fa9515fdf7b13c5ac28e37f0f9 Mon Sep 17 00:00:00 2001
+From: Luke Dashjr <luke-jr+git@utopios.org>
+Date: Thu, 30 Jun 2016 01:51:09 +0000
+Subject: [PATCH] Bugfix: Allow building libbitcoinconsensus without any
+ univalue
+
+---
+ configure.ac | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 24f9f09..a23c645 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -750,6 +750,10 @@ fi
+
+ dnl univalue check
+
++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
+@@ -782,6 +786,9 @@ 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)
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild
index 2a45987128df..5b8dc1e45be8 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild
@@ -16,6 +16,12 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+src_prepare() {
+ bitcoincore_prepare
+ epatch "${FILESDIR}/${PV}-no_univalue.patch"
+ bitcoincore_autoreconf
+}
+
src_configure() {
bitcoincore_conf \
--with-libs