From aea87c061320330556be1e8dc5b4eca5b5c4600f Mon Sep 17 00:00:00 2001 From: Dylam De La Torre Date: Wed, 31 May 2023 16:42:09 +0200 Subject: [PATCH] Fix compilation and creation of Docker image Some recent updates in the edge version broke the build. Also fix some warnings by Meson. --- Dockerfile | 4 ++-- meson_options.txt | 2 +- src/Multirole/YGOPro/StringUtils.cpp | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0dd7d5f..bb76c87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Install all the runtime dependencies for Multirole. FROM alpine:edge AS base -RUN apk add --no-cache --repository "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" boost-filesystem ca-certificates libgit2 libssl1.1 tcmalloc-minimal@testing sqlite-libs xz && \ +RUN apk add --no-cache --repository "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" boost-filesystem ca-certificates libgit2 libssl3 tcmalloc-minimal@testing sqlite-libs xz && \ rm -rf /var/log/* /tmp/* /var/tmp/* # Install all the development environment that Multirole needs. @@ -15,7 +15,7 @@ COPY src/ ./src/ COPY meson.build . COPY meson_options.txt . ENV BOOST_INCLUDEDIR=/usr/include/boost BOOST_LIBRARYDIR=/usr/lib -RUN meson setup build --buildtype=debugoptimized -Doptimization=3 -Db_lto=true -Db_pie=true -Dcpp_link_args="-static-libstdc++" -Duse_tcmalloc=enabled -Dfmt_ho=true && \ +RUN meson setup build -Doptimization=3 -Ddebug=true -Db_lto=true -Db_pie=true -Dcpp_link_args="-static-libstdc++" -Duse_tcmalloc=enabled -Dfmt_ho=true && \ cd "build" && \ meson compile && \ objcopy --only-keep-debug "hornet" "hornet.debug" && \ diff --git a/meson_options.txt b/meson_options.txt index 210bccd..3fd4c15 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,2 +1,2 @@ option('use_tcmalloc', type : 'feature', value : 'auto', description : 'Use Google\'s TCMalloc for memory allocation instead of default allocator') -option('fmt_ho', type : 'boolean', value : 'false', description : 'Use header-only version of {fmt}') +option('fmt_ho', type : 'boolean', value : false, description : 'Use header-only version of {fmt}') diff --git a/src/Multirole/YGOPro/StringUtils.cpp b/src/Multirole/YGOPro/StringUtils.cpp index ea2e1f9..b87cf65 100644 --- a/src/Multirole/YGOPro/StringUtils.cpp +++ b/src/Multirole/YGOPro/StringUtils.cpp @@ -1,7 +1,8 @@ #include "StringUtils.hpp" -#include #include +#include +#include #include namespace YGOPro