Skip to content

Commit a0648d1

Browse files
author
adam
committed
1 parent 9c722f8 commit a0648d1

4 files changed

Lines changed: 24 additions & 43 deletions

File tree

finance/bitcoin/Makefile

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# $NetBSD: Makefile,v 1.92 2025/07/03 06:28:31 wiz Exp $
1+
# $NetBSD: Makefile,v 1.93 2025/07/17 11:22:59 adam Exp $
22

3-
DISTNAME= bitcoin-28.1
4-
PKGREVISION= 5
3+
DISTNAME= bitcoin-29.0
54
CATEGORIES= finance
65
MASTER_SITES= https://bitcoincore.org/bin/bitcoin-core-${PKGVERSION_NOREV}/
76

@@ -15,15 +14,18 @@ RCD_SCRIPTS= bitcoind
1514
USE_CXX_FEATURES+= c++20 filesystem
1615
USE_LANGUAGES= c c++
1716
USE_LIBTOOL= yes
18-
USE_TOOLS+= autoconf automake gmake pkg-config
19-
GNU_CONFIGURE= yes
20-
CONFIGURE_ARGS+= --disable-ccache
21-
CONFIGURE_ARGS+= --disable-hardening # uses -fPIE which is problemtic
22-
CONFIGURE_ARGS+= --with-boost=${BUILDLINK_PREFIX.boost-libs}
17+
USE_TOOLS+= pkg-config
18+
CMAKE_CONFIGURE_ARGS+= -DBUILD_BENCH=ON
19+
CMAKE_CONFIGURE_ARGS+= -DBUILD_UTIL=ON
2320
# Tests take a lot of time to compile.
24-
CONFIGURE_ARGS+= --disable-tests
25-
PKGCONFIG_OVERRIDE= libbitcoinconsensus.pc.in
26-
TEST_TARGET= check
21+
CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=OFF
22+
CMAKE_CONFIGURE_ARGS+= -DBUILD_TX=OFF
23+
CMAKE_CONFIGURE_ARGS+= -DBUILD_WALLET_TOOL=ON
24+
CMAKE_CONFIGURE_ARGS+= -DENABLE_HARDENING=OFF # uses -fPIE which is problemtic
25+
CMAKE_CONFIGURE_ARGS+= -DWITH_BDB=ON
26+
CMAKE_CONFIGURE_ARGS+= -DWITH_CCACHE=OFF
27+
CMAKE_CONFIGURE_ARGS+= -DWITH_ZMQ=ON
28+
PKGCONFIG_OVERRIDE= libbitcoinkernel.pc.in
2729

2830
.include "../../mk/bsd.prefs.mk"
2931

@@ -45,11 +47,10 @@ INSTALL_DIRS= ${BUILD_DIRS} src/secp256k1 #src/univalue
4547

4648
.include "options.mk"
4749

48-
pre-configure:
49-
cd ${WRKSRC} && autoreconf -fiv
50-
5150
.include "../../databases/db4/buildlink3.mk"
51+
.include "../../databases/sqlite3/buildlink3.mk"
5252
.include "../../devel/boost-libs/buildlink3.mk"
53+
.include "../../devel/cmake/build.mk"
5354
BUILDLINK_API_DEPENDS.libevent+= libevent>=2.0.21
5455
.include "../../devel/libevent/buildlink3.mk"
5556
.include "../../net/zeromq/buildlink3.mk"

finance/bitcoin/PLIST

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
1-
@comment $NetBSD: PLIST,v 1.9 2025/02/07 17:36:10 adam Exp $
1+
@comment $NetBSD: PLIST,v 1.10 2025/07/17 11:22:59 adam Exp $
22
bin/bench_bitcoin
33
bin/bitcoin-cli
44
${PLIST.qt}bin/bitcoin-qt
5-
bin/bitcoin-tx
65
bin/bitcoin-util
76
bin/bitcoin-wallet
87
bin/bitcoind
9-
include/secp256k1.h
10-
include/secp256k1_ellswift.h
11-
include/secp256k1_extrakeys.h
12-
include/secp256k1_preallocated.h
13-
include/secp256k1_recovery.h
14-
include/secp256k1_schnorrsig.h
15-
lib/libsecp256k1.la
16-
lib/pkgconfig/libsecp256k1.pc
178
man/man1/bitcoin-cli.1
189
${PLIST.qt}man/man1/bitcoin-qt.1
19-
man/man1/bitcoin-tx.1
2010
man/man1/bitcoin-util.1
2111
man/man1/bitcoin-wallet.1
2212
man/man1/bitcoind.1

finance/bitcoin/distinfo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
$NetBSD: distinfo,v 1.22 2025/02/07 17:36:10 adam Exp $
1+
$NetBSD: distinfo,v 1.23 2025/07/17 11:22:59 adam Exp $
22

3-
BLAKE2s (bitcoin-28.1.tar.gz) = e035d6e6e0e7f11f3fbab0a16c92a3525adf0dae8fecbc08c394178697fb04d0
4-
SHA512 (bitcoin-28.1.tar.gz) = 9ed01409e11140cdb5c00bbbe17f909bcb3d067e0a4ef335aa18faa1585a43cdcd71d384eec79d613244ed569b096276b1c1ae879dad27410fb098bc456f9b86
5-
Size (bitcoin-28.1.tar.gz) = 12596371 bytes
3+
BLAKE2s (bitcoin-29.0.tar.gz) = 2a3d53e72681c64c183f339ad182819a19804e333de5b0aac1e4943ba83d1951
4+
SHA512 (bitcoin-29.0.tar.gz) = 3f5906a437592c55bfbdcec1b1457fdfbe52e9cf6ddc18e6bc153b526846f842283de88f9bf6aa43c3ac624b041d68ea8fc34090a8590bdabdac5a52650cc7dd
5+
Size (bitcoin-29.0.tar.gz) = 12935061 bytes
66
SHA1 (patch-src_netbase.cpp) = d160078c9a7aedc5b569a89ebf9afa98b0d2022b

finance/bitcoin/options.mk

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# $NetBSD: options.mk,v 1.3 2019/09/20 16:57:28 adam Exp $
1+
# $NetBSD: options.mk,v 1.4 2025/07/17 11:22:59 adam Exp $
22

3-
PKG_OPTIONS_VAR= PKG_OPTIONS.bitcoin
4-
PKG_SUPPORTED_OPTIONS+= qt5 upnp
3+
PKG_OPTIONS_VAR= PKG_OPTIONS.bitcoin
4+
PKG_SUPPORTED_OPTIONS+= qt5
55
# qt5 is off because it doubles the footprint of the package.
66
# Please do not enable it by default; instead, create a split
77
# package.
@@ -11,19 +11,9 @@ PKG_SUPPORTED_OPTIONS+= qt5 upnp
1111
PLIST_VARS+= qt
1212

1313
.if !empty(PKG_OPTIONS:Mqt5)
14-
CONFIGURE_ARGS+= --with-gui=qt5
15-
CONFIGURE_ARGS+= --with-qt-bindir=${QTDIR}/bin
14+
CMAKE_CONFIGURE_ARGS+= -DBUILD_GUI=ON
1615
PLIST.qt= yes
1716
.include "../../converters/qrencode/buildlink3.mk"
1817
.include "../../devel/protobuf/buildlink3.mk"
1918
.include "../../x11/qt5-qttools/buildlink3.mk"
20-
.else
21-
CONFIGURE_ARGS+= --with-gui=no
22-
.endif
23-
24-
.if !empty(PKG_OPTIONS:Mupnp)
25-
CONFIGURE_ARGS+= --with-miniupnpc
26-
.include "../../net/miniupnpc/buildlink3.mk"
27-
.else
28-
CONFIGURE_ARGS+= --without-miniupnpc
2919
.endif

0 commit comments

Comments
 (0)