Skip to content
This repository was archived by the owner on Aug 30, 2025. It is now read-only.

Commit a2f0b5a

Browse files
Bump the Meson version on naev-macos to a pre-release, due to a bug cross-compiling with link-time optimization enabled.
1 parent 5e330f1 commit a2f0b5a

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
- `naev-steamruntime` (Used for linux steam builds in the steamruntime (soldier) environment)
99
- `naev-windows` (Used to cross compile for Windows.)
1010

11+
### v1.5.14
12+
Bump the Meson version on naev-macos to a pre-release, due to a bug cross-compiling with link-time optimization enabled.
13+
1114
### v1.5.13
1215
Add LaTeX packages for generating the devmanual PDF for `naev-docs`
1316
Change to Fedora packaged ldoc for `naev-docs`

naev-macos/Dockerfile.aarch64

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ ENV HOST "aarch64-apple-darwin20.1"
8383
ENV APPIMAGE_EXTRACT_AND_RUN 1
8484

8585
# Install build tools.
86-
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettext genisoimage git llvm meson ninja-build python3-pyyaml unzip tar xz zlib zip && \
86+
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettext genisoimage git llvm meson ninja-build python3-pip python3-pyyaml unzip tar xz zlib zip && \
8787
microdnf clean all && \
88+
# Update Meson to a pre-release, due to a bug cross-compiling with link-time optimization enabled. (python3-pip is unnecessary once this step is.)
89+
python3 -m pip install git+https://github.com/UncombedCoconut/meson.git@8170743261d50420c1519bf27c4301086db59fa3 && \
8890
# Verify tool version.
8991
echo "Verifying meson install" && \
9092
command -v meson && \

naev-macos/Dockerfile.amd64

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,10 @@ ENV HOST "x86_64-apple-darwin17"
8282
ENV APPIMAGE_EXTRACT_AND_RUN 1
8383

8484
# Install build tools.
85-
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettext genisoimage git llvm meson ninja-build python3-pyyaml unzip tar xz zlib zip && \
85+
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettext genisoimage git llvm meson ninja-build python3-pip python3-pyyaml unzip tar xz zlib zip && \
8686
microdnf clean all && \
87+
# Update Meson to a pre-release, due to a bug cross-compiling with link-time optimization enabled. (python3-pip is unnecessary once this step is.)
88+
python3 -m pip install git+https://github.com/UncombedCoconut/meson.git@8170743261d50420c1519bf27c4301086db59fa3 && \
8789
# Verify tool version.
8890
echo "Verifying meson install" && \
8991
command -v meson && \

0 commit comments

Comments
 (0)