[fix builds on arm] [fix boost builds]
All checks were successful
sgraves/cpp-build-system_msys2/pipeline/head This commit looks good
sgraves/cpp-build-system_mac/pipeline/head This commit looks good
sgraves/cpp-build-system/pipeline/head This commit looks good

This commit is contained in:
2025-12-16 10:34:01 -06:00
parent 787bfcff96
commit 834b2e26de
3 changed files with 5 additions and 4 deletions

View File

@@ -96,8 +96,10 @@ if(PROJECT_ENABLE_BOOST)
if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM) if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
set(BOOST_CXX_STANDARD 14) set(BOOST_CXX_STANDARD 14)
set(BOOST_OPTIONS cxxflags=-Wno-enum-constexpr-conversion)
else() else()
set(BOOST_CXX_STANDARD ${CMAKE_CXX_STANDARD}) set(BOOST_CXX_STANDARD ${CMAKE_CXX_STANDARD})
set(BOOST_OPTIONS define=BOOST_ASIO_HAS_STD_STRING_VIEW)
endif() endif()
set(BOOST_BUILD_ARGS set(BOOST_BUILD_ARGS
@@ -107,12 +109,11 @@ if(PROJECT_ENABLE_BOOST)
architecture=${BOOST_ARCH} architecture=${BOOST_ARCH}
cxxstd-dialect=gnu cxxstd-dialect=gnu
cxxstd=${BOOST_CXX_STANDARD} cxxstd=${BOOST_CXX_STANDARD}
cxxflags=-Wno-enum-constexpr-conversion
define=BOOST_ASIO_HAS_STD_STRING_VIEW
define=BOOST_SYSTEM_NO_DEPRECATED define=BOOST_SYSTEM_NO_DEPRECATED
link=${BOOST_LINK} link=${BOOST_LINK}
threading=multi threading=multi
variant=${BOOST_BUILD_TYPE_LOWER} variant=${BOOST_BUILD_TYPE_LOWER}
${BOOST_OPTIONS}
) )
ExternalProject_Add(boost_project ExternalProject_Add(boost_project

View File

@@ -1,5 +1,5 @@
#comment #comment
FROM alpine:3.23 FROM --platform=linux/amd64 alpine:3.23
MAINTAINER Scott E. Graves <scott.e.graves@protonmail.com> MAINTAINER Scott E. Graves <scott.e.graves@protonmail.com>
CMD bash CMD bash

View File

@@ -1,5 +1,5 @@
#comment #comment
FROM alpine:3.23 FROM --platform=linux/amd64 alpine:3.23
RUN apk update RUN apk update
RUN apk upgrade RUN apk upgrade