From 6b67475ccaf623126c83ea8e6693d70ea11f10e7 Mon Sep 17 00:00:00 2001 From: Bitcoin Tools <156422466+bitcoin-tools@users.noreply.github.com> Date: Sat, 5 Oct 2024 06:39:10 -0400 Subject: [PATCH 1/2] refactor(deps): make NetBSD build deps install more consistent --- nodebuilder | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nodebuilder b/nodebuilder index 6f9ef5389..4d6c29f29 100755 --- a/nodebuilder +++ b/nodebuilder @@ -859,13 +859,7 @@ install_build_dependencies_netbsd() dependencies=$(torsocks curl --fail --silent --show-error --location --retry 2 "${BUILD_DEPENDENCIES_URL}") || dependencies=$(curl --fail --silent --show-error --location --retry 5 "${BUILD_DEPENDENCIES_URL}") [ -z "${dependencies:-}" ] && throw_error "The list of dependencies is empty." - for package in ${dependencies}; do - log_info "DEBUG INSTALLING ${package}" - if ! sudo pkgin -y install "${package}"; then - cat /var/db/pkgin/pkg_install-err.log - throw_error "DEBUG FAILED TO INSTALL: ${package}" - fi - done + printf '%s\n' "${dependencies}" | xargs sudo pkgin -y install > /dev/null # TODO: Remove gcc-12 installation on next line when NetBSD updates the default version of gcc to support C++ 20 features. Bitcoin Core requires gcc with support for C++ 20 features. sudo pkgin -y install gcc12 && PATH="/usr/pkg/gcc12/bin:${PATH}" } From 6817637247412ea45bb1f2a0c210f636d1e30403 Mon Sep 17 00:00:00 2001 From: Bitcoin Tools <156422466+bitcoin-tools@users.noreply.github.com> Date: Sat, 5 Oct 2024 06:40:26 -0400 Subject: [PATCH 2/2] suppress stdout in NetBDS configure --- nodebuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodebuilder b/nodebuilder index 4d6c29f29..df2466d8d 100755 --- a/nodebuilder +++ b/nodebuilder @@ -82,7 +82,7 @@ compile_bitcoin_from_source() ./configure --without-bdb --enable-suppress-external-warnings MAKE=gmake > /dev/null ;; NetBSD) - ./configure --with-gui=no --with-boost=/usr/pkg --without-bdb --enable-suppress-external-warnings MAKE=gmake + ./configure --with-gui=no --with-boost=/usr/pkg --without-bdb --enable-suppress-external-warnings MAKE=gmake > /dev/null ;; OpenBSD) ./configure --without-bdb --enable-suppress-external-warnings MAKE=gmake > /dev/null 2>&1