| 1 |
blueness 15/03/03 23:56:08 |
| 2 |
|
| 3 |
Modified: bitcoincore.eclass |
| 4 |
Log: |
| 5 |
Update how dependencies are handled. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.3 eclass/bitcoincore.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bitcoincore.eclass?rev=1.3&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bitcoincore.eclass?rev=1.3&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bitcoincore.eclass?r1=1.2&r2=1.3 |
| 13 |
|
| 14 |
Index: bitcoincore.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/bitcoincore.eclass,v |
| 17 |
retrieving revision 1.2 |
| 18 |
retrieving revision 1.3 |
| 19 |
diff -u -r1.2 -r1.3 |
| 20 |
--- bitcoincore.eclass 24 Feb 2015 12:14:26 -0000 1.2 |
| 21 |
+++ bitcoincore.eclass 3 Mar 2015 23:56:08 -0000 1.3 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2015 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/bitcoincore.eclass,v 1.2 2015/02/24 12:14:26 blueness Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/bitcoincore.eclass,v 1.3 2015/03/03 23:56:08 blueness Exp $ |
| 27 |
# |
| 28 |
# @ECLASS: bitcoincore.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -132,10 +132,12 @@ |
| 31 |
|
| 32 |
BITCOINCORE_COMMON_DEPEND=" |
| 33 |
${OPENSSL_DEPEND} |
| 34 |
- $LIBSECP256K1_DEPEND |
| 35 |
" |
| 36 |
+if [ "${BITCOINCORE_NEED_LIBSECP256K1}" = "1" ]; then |
| 37 |
+ BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} $LIBSECP256K1_DEPEND" |
| 38 |
+fi |
| 39 |
if [ "${PN}" != "libbitcoinconsensus" ]; then |
| 40 |
- BITCOINCORE_COMMON_DEPEND=">=dev-libs/boost-1.52.0[threads(+)]" |
| 41 |
+ BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} >=dev-libs/boost-1.52.0[threads(+)]" |
| 42 |
fi |
| 43 |
bitcoincore_common_depend_use() { |
| 44 |
in_bcc_iuse "$1" || return |
| 45 |
@@ -149,6 +151,9 @@ |
| 46 |
>=app-shells/bash-4.1 |
| 47 |
sys-apps/sed |
| 48 |
" |
| 49 |
+if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then |
| 50 |
+ RDEPEND="${RDEPEND} virtual/bitcoin-leveldb" |
| 51 |
+fi |
| 52 |
if in_bcc_iuse ljr && [ "$BITCOINCORE_SERIES" = "0.10.x" ]; then |
| 53 |
DEPEND="${DEPEND} ljr? ( dev-vcs/git )" |
| 54 |
fi |
| 55 |
@@ -263,10 +268,13 @@ |
| 56 |
else |
| 57 |
my_econf="${my_econf} --without-utils" |
| 58 |
fi |
| 59 |
+ if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then |
| 60 |
+ # Passing --with-system-leveldb fails if leveldb is not installed, so only use it for targets that use LevelDB |
| 61 |
+ my_econf="${my_econf} --with-system-leveldb" |
| 62 |
+ fi |
| 63 |
econf \ |
| 64 |
--disable-ccache \ |
| 65 |
--disable-static \ |
| 66 |
- --with-system-leveldb \ |
| 67 |
--with-system-libsecp256k1 \ |
| 68 |
--without-libs \ |
| 69 |
--without-daemon \ |
Archives