From 834b2e26de6d68ee3ba526ef8d2ea00c5e8c1145 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Tue, 16 Dec 2025 10:34:01 -0600 Subject: [PATCH] [fix builds on arm] [fix boost builds] --- cmake/libraries/boost.cmake | 5 +++-- docker/x86_64/alpine | 2 +- docker/x86_64/mingw64 | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/libraries/boost.cmake b/cmake/libraries/boost.cmake index e2beb83..e0e3f64 100644 --- a/cmake/libraries/boost.cmake +++ b/cmake/libraries/boost.cmake @@ -96,8 +96,10 @@ if(PROJECT_ENABLE_BOOST) if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM) set(BOOST_CXX_STANDARD 14) + set(BOOST_OPTIONS cxxflags=-Wno-enum-constexpr-conversion) else() set(BOOST_CXX_STANDARD ${CMAKE_CXX_STANDARD}) + set(BOOST_OPTIONS define=BOOST_ASIO_HAS_STD_STRING_VIEW) endif() set(BOOST_BUILD_ARGS @@ -107,12 +109,11 @@ if(PROJECT_ENABLE_BOOST) architecture=${BOOST_ARCH} cxxstd-dialect=gnu cxxstd=${BOOST_CXX_STANDARD} - cxxflags=-Wno-enum-constexpr-conversion - define=BOOST_ASIO_HAS_STD_STRING_VIEW define=BOOST_SYSTEM_NO_DEPRECATED link=${BOOST_LINK} threading=multi variant=${BOOST_BUILD_TYPE_LOWER} + ${BOOST_OPTIONS} ) ExternalProject_Add(boost_project diff --git a/docker/x86_64/alpine b/docker/x86_64/alpine index fa109de..888d8a5 100644 --- a/docker/x86_64/alpine +++ b/docker/x86_64/alpine @@ -1,5 +1,5 @@ #comment -FROM alpine:3.23 +FROM --platform=linux/amd64 alpine:3.23 MAINTAINER Scott E. Graves CMD bash diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64 index 94f3859..6edbe53 100644 --- a/docker/x86_64/mingw64 +++ b/docker/x86_64/mingw64 @@ -1,5 +1,5 @@ #comment -FROM alpine:3.23 +FROM --platform=linux/amd64 alpine:3.23 RUN apk update RUN apk upgrade