Since we have waitid(2) in base and boost we can update net/bitcoin to
the latest version. All tests and bench passed and the daemon runs fine
on amd64.
OK, feedback?
Rafael
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/bitcoin/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile 24 May 2022 18:51:25 -0000 1.34
+++ Makefile 5 Nov 2022 14:49:16 -0000
@@ -4,9 +4,7 @@ COMMENT = P2P payment system
GH_ACCOUNT = bitcoin
GH_PROJECT = bitcoin
-GH_TAGNAME = v0.21.2
-
-REVISION = 0
+GH_TAGNAME = v23.0
SHARED_LIBS += bitcoinconsensus 4.0 # 0.0
SHARED_LIBS += secp256k1 0.1 # 0.0
@@ -21,19 +19,19 @@ MAINTAINER = Rafael Sadowski <rsadowski
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} boost_filesystem boost_system boost_thread-mt
-WANTLIB += c db_cxx event_core event_extra event_pthreads m sodium
-WANTLIB += sqlite3 z zmq
+WANTLIB += ${COMPILER_LIBCXX} c db_cxx event_core event_extra
+WANTLIB += event_pthreads m sodium sqlite3 z zmq
+
+BUILD_DEPENDS = devel/boost
LIB_DEPENDS = databases/db/v4 \
databases/sqlite3 \
- devel/boost \
devel/libevent2 \
net/zeromq
USE_GMAKE = Yes
-# C++11
+# C++17
# Undefined reference to boost and db4 with GCC
COMPILER = base-clang ports-clang
@@ -42,12 +40,13 @@ AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.14
AUTORECONF = ./autogen.sh
CONFIGURE_ARGS += --with-incompatible-bdb \
+ --with-sqlite=yes \
--disable-bip70
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include/db4 -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib/db4"
-CXXFLAGS += -std=c++11
+CXXFLAGS += -std=c++17
MAKE_FLAGS = CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
@@ -82,8 +81,6 @@ SUBST_VARS += VARBASE
post-install:
cd ${WRKBUILD}/src/secp256k1 && \
- ${MAKE_PROGRAM} ${MAKE_FLAGS} install
- cd ${WRKBUILD}/src/univalue && \
${MAKE_PROGRAM} ${MAKE_FLAGS} install
${INSTALL_DATA_DIR} ${PREFIX}/share/bitcoin
${INSTALL_SCRIPT} ${WRKDIST}/share/rpcauth/rpcauth.py \
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/bitcoin/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo 11 Oct 2021 04:59:08 -0000 1.15
+++ distinfo 5 Nov 2022 14:49:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (bitcoin-0.21.2.tar.gz) = QUb3UfxWkb3PkRy9uNMtjSXCl9KdWBcyJ64a5kOO254=
-SIZE (bitcoin-0.21.2.tar.gz) = 7762621
+SHA256 (bitcoin-23.0.tar.gz) = JnSL9J1ta0AU0P7cysRr8rzKQunTSzrP2eNGfEFazAU=
+SIZE (bitcoin-23.0.tar.gz) = 10978750
Index: patches/patch-build-aux_m4_bitcoin_find_bdb48_m4
===================================================================
RCS file: /cvs/ports/net/bitcoin/patches/patch-build-aux_m4_bitcoin_find_bdb48_m4,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-build-aux_m4_bitcoin_find_bdb48_m4
--- patches/patch-build-aux_m4_bitcoin_find_bdb48_m4 11 Mar 2022 19:45:47 -0000 1.2
+++ patches/patch-build-aux_m4_bitcoin_find_bdb48_m4 5 Nov 2022 14:49:16 -0000
@@ -3,7 +3,7 @@ Build with BerkeleyDB >= 4.6
Index: build-aux/m4/bitcoin_find_bdb48.m4
--- build-aux/m4/bitcoin_find_bdb48.m4.orig
+++ build-aux/m4/bitcoin_find_bdb48.m4
-@@ -22,7 +22,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
+@@ -24,7 +24,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <${searchpath}db_cxx.h>
]],[[
@@ -12,7 +12,7 @@ Index: build-aux/m4/bitcoin_find_bdb48.m
#error "failed to find bdb 4.8+"
No comments:
Post a Comment