Skip to content

Commit

Permalink
Fix compilation and creation of Docker image
Browse files Browse the repository at this point in the history
Some recent updates in the edge version broke the build.

Also fix some warnings by Meson.
  • Loading branch information
DyXel committed May 31, 2023
1 parent 52524cb commit aea87c0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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" && \
Expand Down
2 changes: 1 addition & 1 deletion meson_options.txt
Original file line number Diff line number Diff line change
@@ -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}')
3 changes: 2 additions & 1 deletion src/Multirole/YGOPro/StringUtils.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#include "StringUtils.hpp"

#include <cstring>
#include <codecvt>
#include <cstdint>
#include <cstring>
#include <locale>

namespace YGOPro
Expand Down

0 comments on commit aea87c0

Please sign in to comment.