sgraves/cpp-build-system
1
0
Fork 0
Code Issues 3 Pull Requests Releases 2 Activity

upgrade alpine and c++ std

Browse Source
This commit is contained in:
sgraves76
2025-12-13 17:48:07 -06:00
parent b74b69ff55
commit e44db70f59
7 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/x86_64/alpine
View File

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

9
docker/x86_64/mingw64
View File

@@ -1,5 +1,5 @@
#comment
FROM alpine:3.22.2
FROM alpine:3.23
RUN apk update
RUN apk upgrade
@@ -64,7 +64,10 @@ ENV MY_MINGW_PREFIX=${MINGW_PREFIX}
ARG NUM_JOBS=2
ENV MY_NUM_JOBS=${NUM_JOBS}
ARG CXX_STANDARD=20
ARG C_STANDARD=11
ENV MY_C_STANDARD=${C_STANDARD}
ARG CXX_STANDARD=23
ENV MY_CXX_STANDARD=${CXX_STANDARD}
ARG TOOLCHAIN_FILE_CMAKE=/cmake_toolchain.cmake
@@ -274,7 +277,7 @@ RUN python3 -m pip install --break-system-packages -U mako
RUN python3 -m pip install --break-system-packages -U meson
RUN python3 -m pip install --break-system-packages -U packaging
ENV CXXFLAGS="-std=gnu++20"
ENV CXXFLAGS="-std=gnu++${MY_CXX_STANDARD}"
ENV LDFLAGS="-L${MY_MINGW_DIR}/lib -L${MY_MINGW_DIR}/lib64"
ENV PATH="${MY_MINGW_DIR}/bin:/usr/local/bin:${PATH}"
ENV PKG_CONFIG_PATH="${MY_MINGW_DIR}/lib/pkgconfig:${MY_MINGW_DIR}/lib64/pkgconfig"