Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libbitcoinconsensus/files/, net-libs/libbitcoinconsensus/
Date: Fri, 01 Jul 2016 23:28:51
Message-Id: 1467415899.2c978e47a95b4cdc14e5cacff5617607979dacb0.blueness@gentoo
1 commit: 2c978e47a95b4cdc14e5cacff5617607979dacb0
2 Author: Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
3 AuthorDate: Fri Jul 1 17:27:37 2016 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 1 23:31:39 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c978e47
7
8 Bugfix: net-libs/libbitcoinconsensus-0.12.0: Build without univalue
9
10 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
11
12 .../files/0.12.0-no_univalue.patch | 35 ++++++++++++++++++++++
13 .../libbitcoinconsensus-0.12.0.ebuild | 6 ++++
14 2 files changed, 41 insertions(+)
15
16 diff --git a/net-libs/libbitcoinconsensus/files/0.12.0-no_univalue.patch b/net-libs/libbitcoinconsensus/files/0.12.0-no_univalue.patch
17 new file mode 100644
18 index 0000000..c6d8f63
19 --- /dev/null
20 +++ b/net-libs/libbitcoinconsensus/files/0.12.0-no_univalue.patch
21 @@ -0,0 +1,35 @@
22 +From c0251eab760f00fa9515fdf7b13c5ac28e37f0f9 Mon Sep 17 00:00:00 2001
23 +From: Luke Dashjr <luke-jr+git@×××××××.org>
24 +Date: Thu, 30 Jun 2016 01:51:09 +0000
25 +Subject: [PATCH] Bugfix: Allow building libbitcoinconsensus without any
26 + univalue
27 +
28 +---
29 + configure.ac | 7 +++++++
30 + 1 file changed, 7 insertions(+)
31 +
32 +diff --git a/configure.ac b/configure.ac
33 +index 24f9f09..a23c645 100644
34 +--- a/configure.ac
35 ++++ b/configure.ac
36 +@@ -750,6 +750,10 @@ fi
37 +
38 + dnl univalue check
39 +
40 ++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnononononono; then
41 ++ system_univalue=yes
42 ++else
43 ++
44 + if test x$system_univalue != xno ; then
45 + found_univalue=no
46 + if test x$use_pkgconfig = xyes; then
47 +@@ -782,6 +786,9 @@ if test x$system_univalue = xno ; then
48 + UNIVALUE_CFLAGS='-I$(srcdir)/univalue/include'
49 + UNIVALUE_LIBS='univalue/libunivalue.la'
50 + fi
51 ++
52 ++fi
53 ++
54 + AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$system_univalue = xno])
55 + AC_SUBST(UNIVALUE_CFLAGS)
56 + AC_SUBST(UNIVALUE_LIBS)
57
58 diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild
59 index 2a45987..5b8dc1e 100644
60 --- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild
61 +++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild
62 @@ -16,6 +16,12 @@ LICENSE="MIT"
63 SLOT="0"
64 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
65
66 +src_prepare() {
67 + bitcoincore_prepare
68 + epatch "${FILESDIR}/${PV}-no_univalue.patch"
69 + bitcoincore_autoreconf
70 +}
71 +
72 src_configure() {
73 bitcoincore_conf \
74 --with-libs