This commit is contained in:
2026-01-08 21:12:41 -06:00
parent db80b958fd
commit 28ef84a69b
10 changed files with 62 additions and 17 deletions

View File

@@ -81,5 +81,5 @@ RUN apk add \
zstd-static \
xz-static
RUN ln -sf /usr/bin/aclocal-1.17 /usr/bin/aclocal-1.16
RUN ln -sf /usr/bin/automake-1.17 /usr/bin/automake-1.16
RUN ln -sf /usr/bin/aclocal-1.18 /usr/bin/aclocal-1.16
RUN ln -sf /usr/bin/automake-1.18 /usr/bin/automake-1.16

View File

@@ -1,5 +1,9 @@
#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
@@ -81,5 +85,5 @@ RUN apk add \
zstd-static \
xz-static
RUN ln -sf /usr/bin/aclocal-1.17 /usr/bin/aclocal-1.16
RUN ln -sf /usr/bin/automake-1.17 /usr/bin/automake-1.16
RUN ln -sf /usr/bin/aclocal-1.18 /usr/bin/aclocal-1.16
RUN ln -sf /usr/bin/automake-1.18 /usr/bin/automake-1.16

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,9 @@
#comment
<<<<<<< HEAD
FROM alpine:3.23
=======
FROM --platform=linux/amd64 alpine:3.23
>>>>>>> 70cc850f10c2fcd1733ae05dce5c4503db3a11f3
RUN apk update
RUN apk upgrade
@@ -842,6 +846,7 @@ RUN if [ -f "/3rd_party/libevent-${MY_LIBEVENT_VERSION}-stable.tar.gz" ]; then \
-DCMAKE_CXX_STANDARD=${MY_CXX_STANDARD} \
-DCMAKE_C_FLAGS="-include winsock2.h -include ws2tcpip.h -include iphlpapi.h" \
-DCMAKE_INSTALL_PREFIX=${MY_MINGW_DIR} \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_TOOLCHAIN_FILE=${MY_TOOLCHAIN_FILE_CMAKE} \
-DEVENT__DISABLE_OPENSSL=ON \
-DEVENT__DISABLE_SAMPLES=ON \