Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Mar 2018 18:28:13 +0000 (UTC)
From:      Vasil Dimov <vd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r465623 - in head/net-p2p: bitcoin-daemon bitcoin-utils
Message-ID:  <201803261828.w2QISDlq054761@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vd
Date: Mon Mar 26 18:28:12 2018
New Revision: 465623
URL: https://svnweb.freebsd.org/changeset/ports/465623

Log:
  Set default BDB version in bitcoin slave ports
  
  In c465619 a new single-choice option was introduced in net-p2p/bitcoin
  where exactly one variant must be chosen (BDB version). But the bitcoin
  slave ports net-p2p/bitcoin-daemon and net-p2p/bitcoin-utils set
  OPTIONS_DEFAULT=... (with missing BDB version) and the master port uses
  OPTIONS_DEFAULT?=...somebdbversion... so the choice of the master port
  is not inherited by the slaves.
  
  Fix this by explicitly setting the BDB version in both slave ports.
  
  Reported by:	Dan Langille

Modified:
  head/net-p2p/bitcoin-daemon/Makefile
  head/net-p2p/bitcoin-utils/Makefile

Modified: head/net-p2p/bitcoin-daemon/Makefile
==============================================================================
--- head/net-p2p/bitcoin-daemon/Makefile	Mon Mar 26 18:14:44 2018	(r465622)
+++ head/net-p2p/bitcoin-daemon/Makefile	Mon Mar 26 18:28:12 2018	(r465623)
@@ -11,7 +11,9 @@ NOT_FOR_ARCHS=		powerpc powerpc64 sparc64
 NOT_FOR_ARCHS_REASON=	does not support big-endian architectures
 
 OPTIONS_DEFINE=		DEBUG HARDENING TESTS UPNP WALLET ZMQ
-OPTIONS_DEFAULT=	HARDENING UPNP WALLET
+# BDBMODERN is a choice for BDBVER, introduced via OPTIONS_SINGLE=BDBVER
+# from ${MASTERDIR}/Makefile
+OPTIONS_DEFAULT=	BDBMODERN HARDENING UPNP WALLET
 
 USERS=		bitcoin
 GROUPS=		bitcoin

Modified: head/net-p2p/bitcoin-utils/Makefile
==============================================================================
--- head/net-p2p/bitcoin-utils/Makefile	Mon Mar 26 18:14:44 2018	(r465622)
+++ head/net-p2p/bitcoin-utils/Makefile	Mon Mar 26 18:28:12 2018	(r465623)
@@ -10,7 +10,9 @@ NOT_FOR_ARCHS=		powerpc powerpc64 sparc64
 NOT_FOR_ARCHS_REASON=	does not support big-endian architectures
 
 OPTIONS_DEFINE=		DEBUG HARDENING TESTS
-OPTIONS_DEFAULT=	HARDENING TESTS
+# BDBMODERN is a choice for BDBVER, introduced via OPTIONS_SINGLE=BDBVER
+# from ${MASTERDIR}/Makefile
+OPTIONS_DEFAULT=	BDBMODERN HARDENING TESTS
 
 CONFIGURE_ARGS=	--without-daemon \
 		--without-gui \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803261828.w2QISDlq054761>