updated build system
All checks were successful
Blockstorage/repertory_msys2/pipeline/head This commit looks good
BlockStorage/repertory/pipeline/head This commit looks good

This commit is contained in:
2025-12-16 10:47:25 -06:00
parent f0396fccd5
commit 70cc850f10
7 changed files with 23 additions and 14 deletions

View File

@@ -48,6 +48,10 @@ list(APPEND PROJECT_CXXFLAGS_LIST
-Wunused
)
if (PROJECT_ENABLE_LIBBITCOIN_SYSTEM AND PROJECT_IS_DARWIN)
list(APPEND PROJECT_CXXFLAGS_LIST -Wno-enum-constexpr-conversion)
endif()
if (NOT PROJECT_IS_DARWIN)
list(APPEND PROJECT_CXXFLAGS_LIST
-Wduplicated-branches

View File

@@ -95,9 +95,11 @@ if(PROJECT_ENABLE_BOOST)
endif()
if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
set(BOOST_CXX_STANDARD 20)
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
@@ -106,14 +108,12 @@ if(PROJECT_ENABLE_BOOST)
address-model=64
architecture=${BOOST_ARCH}
cxxstd-dialect=gnu
cxxflags=-std=gnu++${BOOST_CXX_STANDARD}
cxxstd=${BOOST_CXX_STANDARD}
define=BOOST_ASIO_HAS_STD_STRING_VIEW
define=BOOST_SYSTEM_NO_DEPRECATED
link=${BOOST_LINK}
linkflags=-std=gnu++${BOOST_CXX_STANDARD}
threading=multi
variant=${BOOST_BUILD_TYPE_LOWER}
${BOOST_OPTIONS}
)
ExternalProject_Add(boost_project

View File

@@ -1,15 +1,15 @@
set(BINUTILS_VERSION 2.44)
set(BOOST_MAJOR_VERSION 1)
set(BOOST_MINOR_VERSION 89)
set(BOOST_PATCH_VERSION 0)
set(BOOST2_MAJOR_VERSION 1)
set(BOOST2_MINOR_VERSION 76)
set(BOOST2_PATCH_VERSION 0)
set(BOOST_MAJOR_VERSION 1)
set(BOOST_MINOR_VERSION 89)
set(BOOST_PATCH_VERSION 0)
set(CPP_HTTPLIB_VERSION 0.26.0)
set(CURL_VERSION 8.16.0)
set(CURL2_VERSION 8_16_0)
set(EXPAT_VERSION 2.7.1)
set(CURL_VERSION 8.16.0)
set(EXPAT2_VERSION 2_7_1)
set(EXPAT_VERSION 2.7.1)
set(GCC_VERSION 15.2.0)
set(GTEST_VERSION 1.17.0)
set(ICU_VERSION 76-1)
@@ -22,9 +22,9 @@ set(PKG_CONFIG_VERSION 0.29.2)
set(PUGIXML_VERSION 1.15)
set(ROCKSDB_VERSION 10.5.1)
set(SPDLOG_VERSION 1.15.3)
set(SQLITE_VERSION 3500400)
set(SQLITE2_VERSION 3.50.4)
set(SQLITE_VERSION 3500400)
set(STDUUID_VERSION 1.2.3)
set(WINFSP_VERSION 2.1.25156)
set(WINFSP2_VERSION 2.1)
set(WINFSP_VERSION 2.1.25156)
set(ZLIB_VERSION 1.3.1)

View File

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

View File

@@ -11,7 +11,7 @@ RUN apt-get install -y \
fonts-droid-fallback \
gdb \
git \
lib32stdc++6 \
lib32stdc++6-x32-cross \
libglu1-mesa \
libstdc++6 \
python3 \

View File

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

View File

@@ -323,6 +323,11 @@ using vlc_string_t = std::unique_ptr<char, vlc_string_deleter>;
#if defined(__cplusplus)
#if defined(PROJECT_ENABLE_BOOST)
#if defined(PROJECT_ENABLE_LIBBITCOIN_SYSTEM) && defined(PROJECT_IS_DARWIN)
#define BOOST_ASIO_HAS_STD_INVOKE_RESULT
#define BOOST_NO_CXX98_FUNCTION_BASE
#endif // defined(PROJECT_ENABLE_LIBBITCOIN_SYSTEM) &&
// defined(PROJECT_IS_DARWIN)
#include "boost/archive/text_iarchive.hpp"
#include "boost/archive/text_oarchive.hpp"
#include "boost/asio.hpp"