Merge branch 'v2.1.0-rc.2-develop' of ssh://git.fifthgrid.com:3022/BlockStorage/repertory into v2.1.0-rc.2-develop

cmake/libraries/boost.cmake

@@ -95,17 +95,11 @@ if(PROJECT_ENABLE_BOOST)
       endif()
 
       if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
-<<<<<<< HEAD
-        set(BOOST_CXX_STANDARD 20)
-      else()
-        set(BOOST_CXX_STANDARD ${CMAKE_CXX_STANDARD})
-=======
         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)
->>>>>>> 70cc850f10c2fcd1733ae05dce5c4503db3a11f3
       endif()
 
       set(BOOST_BUILD_ARGS
@@ -114,18 +108,9 @@ if(PROJECT_ENABLE_BOOST)
         address-model=64
         architecture=${BOOST_ARCH}
         cxxstd-dialect=gnu
-<<<<<<< HEAD
-        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}
-=======
         cxxstd=${BOOST_CXX_STANDARD}
         define=BOOST_SYSTEM_NO_DEPRECATED
         link=${BOOST_LINK}
->>>>>>> 70cc850f10c2fcd1733ae05dce5c4503db3a11f3
         threading=multi
         variant=${BOOST_BUILD_TYPE_LOWER}
         ${BOOST_OPTIONS}

docker/x86_64/alpine

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

docker/x86_64/mingw64

@@ -1,9 +1,5 @@
 #comment
-<<<<<<< HEAD
-FROM alpine:3.23
-=======
 FROM --platform=linux/amd64 alpine:3.23
->>>>>>> 70cc850f10c2fcd1733ae05dce5c4503db3a11f3
 
 RUN apk update
 RUN apk upgrade

scripts/docker_common.sh

@@ -19,29 +19,24 @@ if [ "${DOCKER_CREATE_ONLY}" != "1" ]; then
   docker rm ${DOCKER_CONTAINER}
 fi
 
+if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then
+  PLATFORM_TYPE="linux/arm64"
+else
+  PLATFORM_TYPE="linux/amd64"
+fi
+
 pushd "${PROJECT_SOURCE_DIR}/support"
 cp -f ${PROJECT_SOURCE_DIR}/docker/${PROJECT_BUILD_ARCH}/${DOCKER_NAME} Dockerfile
 
-if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then
-  docker build ${APP_VERSION_BUILD_ARGS} \
-    --platform linux/arm64 \
-    --build-arg C_STANDARD=${PROJECT_C_STANDARD} \
-    --build-arg CXX_STANDARD=${PROJECT_CXX_STANDARD} \
-    --build-arg NUM_JOBS=${NUM_JOBS} \
-    --build-arg UID=$(id -u) \
-    --build-arg GID=$(id -g) \
-    --build-arg USERNAME=$(id -un) \
-    -t ${DOCKER_TAG} . || exit 1
-else
-  docker build ${APP_VERSION_BUILD_ARGS} \
-    --build-arg C_STANDARD=${PROJECT_C_STANDARD} \
-    --build-arg CXX_STANDARD=${PROJECT_CXX_STANDARD} \
-    --build-arg NUM_JOBS=${NUM_JOBS} \
-    --build-arg UID=$(id -u) \
-    --build-arg GID=$(id -g) \
-    --build-arg USERNAME=$(id -un) \
-    -t ${DOCKER_TAG} . || exit 1
-fi
+docker build ${APP_VERSION_BUILD_ARGS} \
+  --platform ${PLATFORM_TYPE} \
+  --build-arg C_STANDARD=${PROJECT_C_STANDARD} \
+  --build-arg CXX_STANDARD=${PROJECT_CXX_STANDARD} \
+  --build-arg NUM_JOBS=${NUM_JOBS} \
+  --build-arg UID=$(id -u) \
+  --build-arg GID=$(id -g) \
+  --build-arg USERNAME=$(id -un) \
+  -t ${DOCKER_TAG} . || exit 1
 rm Dockerfile
 popd
 

support/3rd_party/icu_configure.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ "$(uname -m)" == "arm64" ] &&
+if ([ "$(uname -m)" == "arm64" ] || [ "$(uname -m)" == "aarch64" ])  &&
   [ "${PROJECT_IS_ARM64}" == "0" ]; then
   HOST_CFG="--host=x86_64-apple-darwin"
   export CC="clang -arch x86_64"