Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Aug 30, 2025. It is now read-only.

Commitb4a76d4

Browse files
Update Dockerfiles to restrict Meson version to <1.8.0 to avoid upstream bugs with subprojects and wraps.
1 parentabc188e commitb4a76d4

File tree

5 files changed

+28
-10
lines changed

5 files changed

+28
-10
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
-`naev-artwork` (Used to render naev artwork.)***DEPRECATED***
88
-`naev-linux-archaic` (Used for old release builds)***DEPRECATED***
99

10+
###v1.12.10
11+
- Update Dockerfiles to restrict Meson version to <1.8.0 to avoid upstream bugs with subprojects and wraps
12+
1013
###v1.12.9
1114
- Install git version of bindgen when running setup-devenv.sh
1215
- This fixes build issues on non Linux platforms.

‎naev-docs/Dockerfile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,20 @@ ENV IMAGE_NAME "naev-docs"
1010
COPY setup-devenv.sh /usr/bin
1111

1212
# Install utilities
13-
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install make python3-pipmesonninja-build clang gawk gcc git GraphicsMagick gzip llvm libyaml openssl optipng rustup zlib \
13+
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install make python3-pip ninja-build clang gawk gcc git GraphicsMagick gzip llvm libyaml openssl optipng rustup zlib \
1414
python3-pyyaml rsync tidy tar unzip xz zip \
1515
# Install ldoc
1616
lua-ldoc \
1717
# Install LaTeX packages
1818
latexmk texlive-luahbtex texlive-roboto texlive-preprint texlive-parskip texlive-sfmath \
1919
texlive-markdown texlive-csvsimple texlive-gobble texlive-microtype texlive-minted texlive-newunicodechar && \
2020
microdnf clean all && \
21-
# Verify tool versions and install locations.
21+
# Need Meson >=1.7.0 for rust_std=2024, but restrict to versions below 1.8.0.
22+
python3 -m pip install'meson>=1.7.0,<1.8.0' --upgrade && \
23+
# Verify tool versions and installation locations.
24+
echo"Verifying meson install" && \
25+
command -v meson && \
26+
meson --version && \
2227
echo"Verifying latexmk install" && \
2328
command -v latexmk && \
2429
latexmk -v && \

‎naev-macos/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ ENV OSXCROSS_MP_INC "1"
100100
ENV APPIMAGE_EXTRACT_AND_RUN 1
101101

102102
# Install build tools.
103-
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang-devel cmake gettext genisoimage gawk git gzip lldmesonninja-build python3-pip python3-pyyaml rustup unzip tar texinfo xz zlib zip && \
103+
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang-devel cmake gettext genisoimage gawk git gzip lld ninja-build python3-pip python3-pyyaml rustup unzip tar texinfo xz zlib zip && \
104104
microdnf clean all && \
105-
# Need Meson >=1.7.0 for rust_std=2024,which is obviously not up-to-date in steamOS
106-
python3 -m pip install meson --upgrade && \
107-
# Verify toolversion.
105+
# Need Meson >=1.7.0 for rust_std=2024,but restrict to versions below 1.8.0.
106+
python3 -m pip install'meson>=1.7.0,<1.8.0' --upgrade && \
107+
# Verify toolversions and installation locations.
108108
echo"Verifying meson install" && \
109109
command -v meson && \
110110
meson --version && \

‎naev-release/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ WORKDIR /tmp
2323
# Install utilities
2424
RUN curl -L -O https://cli.github.com/packages/rpm/gh-cli.repo --output-dir /etc/yum.repos.d && \
2525
microdnf update -y && \
26-
microdnf --nodocs --setopt=install_weak_deps=0 -y install gh python3-pipmesonninja-build clang gawk gcc gzip python3-pyyaml file git readline-devel rustup tar xz unzip zip \
26+
microdnf --nodocs --setopt=install_weak_deps=0 -y install gh python3-pip ninja-build clang gawk gcc gzip python3-pyyaml file git readline-devel rustup tar xz unzip zip \
2727
# Install SteamCMD and friends
2828
glibc.i686 sdl2-compat.i686 && \
2929
microdnf clean all && \
@@ -45,7 +45,12 @@ RUN curl -L -O https://cli.github.com/packages/rpm/gh-cli.repo --output-dir /etc
4545
mkdir -p /opt/apple-codesign && \
4646
tar --strip-components=1 -xvzf apple-codesign-0.29.0-x86_64-unknown-linux-musl.tar.gz -C /opt/apple-codesign && \
4747
rm apple-codesign-0.29.0-x86_64-unknown-linux-musl.tar.gz && \
48+
# Need Meson >=1.7.0 for rust_std=2024, but restrict to versions below 1.8.0.
49+
python3 -m pip install'meson>=1.7.0,<1.8.0' --upgrade && \
4850
# Verify tool versions and installation locations.
51+
echo"Verifying meson install" && \
52+
command -v meson && \
53+
meson --version && \
4954
echo"Verifying steamcmd install" && \
5055
command -v steamcmd && \
5156
steamcmd +quit && \

‎naev-windows/Dockerfile‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ COPY _copr:copr.fedorainfracloud.org:jackgreiner:mingw64-packages.repo /etc/yum.
1414
COPY setup-devenv.sh /usr/bin
1515

1616
RUN microdnf update -y && \
17-
microdnf --nodocs --setopt=install_weak_deps=0 -y install clang gawk gcc gettext git gzip lld llvm python3-pipmesonninja-build python3-pyyaml rustup tar texinfo xz unzip zip \
17+
microdnf --nodocs --setopt=install_weak_deps=0 -y install clang gawk gcc gettext git gzip lld llvm python3-pip ninja-build python3-pyyaml rustup tar texinfo xz unzip zip \
1818
# OK, seems like the rust is a bit a of mess as it is trying to compile some things internally with hardcoded mingw64 paths
1919
# We have to toss the dependencies here so that it works. In particular, mlua-sys seems to want to build luajit
2020
mingw64-binutils mingw64-gcc \
@@ -28,8 +28,13 @@ RUN microdnf update -y && \
2828
# Install openblas for mingw (building this from source is an option but probably painful)
2929
curl -L -O https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.29/OpenBLAS-0.3.29_x64_64.zip && \
3030
unzip OpenBLAS-0.3.29_x64_64.zip -d /usr/x86_64-w64-mingw32/sys-root/mingw && \
31-
rm -rf OpenBLAS-0.3.29_x64_64.zip
32-
31+
rm -rf OpenBLAS-0.3.29_x64_64.zip && \
32+
# Need Meson >=1.7.0 for rust_std=2024, but restrict to versions below 1.8.0.
33+
python3 -m pip install'meson>=1.7.0,<1.8.0' --upgrade && \
34+
# Verify tool versions and installation locations.
35+
echo"Verifying meson install" && \
36+
command -v meson && \
37+
meson --version
3338
# Force appimages to run in extract mode since FUSE is not available
3439
ENV APPIMAGE_EXTRACT_AND_RUN 1
3540

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp